fielding 99/01/04 23:09:03
Modified: . STATUS
src ApacheCore.mak CHANGES
Added: src Makefile_win32.txt Makefile_win32_debug.txt
Log:
Created new makefiles Makefile_win32.txt (normal build)
and Makefile_win32_debug.txt (debug build) that work on Win95,
since nmake on Win95 doesn't like %variable% substitution.
These should work for NT as well, but I haven't tested on NT.
Revision Changes Path
1.591 +3 -7 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.590
retrieving revision 1.591
diff -u -r1.590 -r1.591
--- STATUS 1999/01/05 06:14:37 1.590
+++ STATUS 1999/01/05 07:08:59 1.591
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/01/05 06:14:37 $]
+ Last modified at [$Date: 1999/01/05 07:08:59 $]
Release:
@@ -22,16 +22,12 @@
Status: Someone who knows the current status of this thing should
apply it now, since the rest of us can't test it otherwise.
- * nmake compilation broken on Win95
- Paul Ausbeck says the problem is that the distribution uses
- %PARAM% type arguments in nmake invokations.
- Message-ID: <[EMAIL PROTECTED]>
- Status: patch needed since we can't test above without it
-
* long pathnames with many components and no AllowOverride None
Status: Marc is looking at it
RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
+
+ * Document compilation on Win95 and NT
* RemoveHandler directive needs docs
1.40 +4 -0 apache-1.3/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /home/cvs/apache-1.3/src/ApacheCore.mak,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ApacheCore.mak 1998/08/09 14:33:09 1.39
+++ ApacheCore.mak 1999/01/05 07:09:00 1.40
@@ -90,6 +90,8 @@
[EMAIL PROTECTED] "$(INTDIR)\util_uri.obj"
[EMAIL PROTECTED] "$(INTDIR)\util_win32.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
+ [EMAIL PROTECTED] "$(INTDIR)\ApacheCore.pch"
+ [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.pch"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.lib"
@@ -304,6 +306,8 @@
[EMAIL PROTECTED] "$(INTDIR)\util_win32.sbr"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(INTDIR)\vc50.pdb"
+ [EMAIL PROTECTED] "$(INTDIR)\ApacheCore.pch"
+ [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.pch"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.bsc"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.exp"
1.1203 +11 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1202
retrieving revision 1.1203
diff -u -r1.1202 -r1.1203
--- CHANGES 1999/01/05 05:14:50 1.1202
+++ CHANGES 1999/01/05 07:09:01 1.1203
@@ -1,5 +1,16 @@
Changes with Apache 1.3.4
+ *) WIN32: Created new makefiles Makefile_win32.txt (normal build)
+ and Makefile_win32_debug.txt (debug build) that work on Win95.
+ Run each of the following from the src directory:
+ nmake /f Makefile_win32.txt # compiles normal build
+ nmake /f Makefile_win32.txt install # compiles and installs
+ nmake /f Makefile_win32.txt clean # removes compiled junk
+ nmake /f Makefile_win32_debug.txt # compiles debug build
+ nmake /f Makefile_win32_debug.txt install
+ nmake /f Makefile_win32_debug.txt clean
+ [Roy Fielding]
+
*) Added binbuild.sh and findprg.sh helpers to make it easier for us
to build binary distributions. [Lars Eilebrecht]
1.1 apache-1.3/src/Makefile_win32.txt
Index: Makefile_win32.txt
===================================================================
# Makefile for Windows NT and Windows 95
# Targets are:
# _apache - build Apache in Release mode
# install - build and install a Release build
# clean - remove (most) files generated by a Release build
#
# The default installation directory is \Apache. This can be changed
# with the INSTDIR macro, for example:
#
# nmake /f Makefile_win32.txt INSTDIR="d:\Program Files\Apache" install
#
# Note: this does *NOT* change the compiled in default "server root"
!IF "$(INSTDIR)" == ""
INSTDIR=\Apache
!MESSAGE Using default install directory \Apache
!ENDIF
default: _apache
_apache: _build
install: _build _install
_build:
cd os\win32
nmake /nologo CFG="ApacheOS - Win32 Release" -f ApacheOS.mak
cd ..\..
cd regex
nmake /nologo CFG="regex - Win32 Release" -f regex.mak
cd ..
cd ap
nmake /nologo CFG="ap - Win32 Release" -f ap.mak
cd ..
cd main
nmake /nologo CFG="gen_uri_delims - Win32 Release" -f
gen_uri_delims.mak
nmake /nologo CFG="gen_test_char - Win32 Release" -f gen_test_char.mak
cd ..
-del CoreR\buildmark.obj
nmake /nologo CFG="ApacheCore - Win32 Release" -f ApacheCore.mak
nmake /nologo CFG="Apache - Win32 Release" -f Apache.mak
cd os\win32
set CFG=ApacheModuleStatus - Win32 Release
nmake /nologo CFG="ApacheModuleStatus - Win32 Release" -f
ApacheModuleStatus.mak
# nmake /nologo CFG ""/nologo -f
ApacheModuleStatus.mak"=ApacheModuleInfo - Win32 Release" -f
ApacheModuleInfo.mak
nmake /nologo CFG="ApacheModuleAuthAnon - Win32 Release" -f
ApacheModuleAuthAnon.mak
nmake /nologo CFG="ApacheModuleDigest - Win32 Release" -f
ApacheModuleDigest.mak
nmake /nologo CFG="ApacheModuleCERNMeta - Win32 Release" -f
ApacheModuleCERNMeta.mak
nmake /nologo CFG="ApacheModuleExpires - Win32 Release" -f
ApacheModuleExpires.mak
nmake /nologo CFG="ApacheModuleHeaders - Win32 Release" -f
ApacheModuleHeaders.mak
nmake /nologo CFG="ApacheModuleSpeling - Win32 Release" -f
ApacheModuleSpeling.mak
nmake /nologo CFG="ApacheModuleUserTrack - Win32 Release" -f
ApacheModuleUserTrack.mak
nmake /nologo CFG="ApacheModuleRewrite - Win32 Release" -f
ApacheModuleRewrite.mak
cd ..\..
cd modules\proxy
nmake /nologo CFG="ApacheModuleProxy - Win32 Release" -f
ApacheModuleProxy.mak
cd ..\..
_install:
-mkdir $(INSTDIR)
-mkdir $(INSTDIR)\modules
-mkdir $(INSTDIR)\logs
-mkdir $(INSTDIR)\conf
copy ApacheR\Apache.exe $(INSTDIR)
copy CoreR\ApacheCore.dll $(INSTDIR)
copy os\win32\ApacheModuleStatusR\ApacheModuleStatus.dll
$(INSTDIR)\modules
# copy os\win32\ApacheModuleInfoR\ApacheModuleInfo.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleAuthAnonR\ApacheModuleAuthAnon.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleDigestR\ApacheModuleDigest.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleCERNMetaR\ApacheModuleCERNMeta.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleExpiresR\ApacheModuleExpires.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleHeadersR\ApacheModuleHeaders.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleRewriteR\ApacheModuleRewrite.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleSpelingR\ApacheModuleSpeling.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleUserTrackR\ApacheModuleUserTrack.dll
$(INSTDIR)\modules
copy modules\proxy\Release\ApacheModuleProxy.dll $(INSTDIR)\modules
clean:
cd os\win32
nmake /nologo CFG="ApacheOS - Win32 Release" -f ApacheOS.mak clean
cd ..\..
cd regex
nmake /nologo CFG="regex - Win32 Release" -f regex.mak clean
cd ..
cd ap
nmake /nologo CFG="ap - Win32 Release" -f ap.mak clean
cd ..
cd main
nmake /nologo CFG="gen_uri_delims - Win32 Release" -f
gen_uri_delims.mak clean
del uri_delims.h
nmake /nologo CFG="gen_test_char - Win32 Release" -f gen_test_char.mak
clean
del test_char.h
cd ..
nmake /nologo CFG="ApacheCore - Win32 Release" -f ApacheCore.mak clean
nmake /nologo CFG="Apache - Win32 Release" -f Apache.mak clean
cd os\win32
nmake /nologo CFG="ApacheModuleStatus - Win32 Release" -f
ApacheModuleStatus.mak clean
# nmake /nologo CFG="ApacheModuleInfo - Win32 Release" -f
ApacheModuleInfo.mak clean
nmake /nologo CFG="ApacheModuleAuthAnon - Win32 Release" -f
ApacheModuleAuthAnon.mak clean
nmake /nologo CFG="ApacheModuleDigest - Win32 Release" -f
ApacheModuleDigest.mak clean
nmake /nologo CFG="ApacheModuleCERNMeta - Win32 Release" -f
ApacheModuleCERNMeta.mak clean
nmake /nologo CFG="ApacheModuleExpires - Win32 Release" -f
ApacheModuleExpires.mak clean
nmake /nologo CFG="ApacheModuleHeaders - Win32 Release" -f
ApacheModuleHeaders.mak clean
nmake /nologo CFG="ApacheModuleSpeling - Win32 Release" -f
ApacheModuleSpeling.mak clean
nmake /nologo CFG="ApacheModuleUserTrack - Win32 Release" -f
ApacheModuleUserTrack.mak clean
nmake /nologo CFG="ApacheModuleRewrite - Win32 Release" -f
ApacheModuleRewrite.mak clean
cd ..\..
cd modules\proxy
nmake /nologo CFG="ApacheModuleProxy - Win32 Release" -f
ApacheModuleProxy.mak clean
cd ..\..
cd os\win32\installer\installdll
nmake /nologo CFG="install - Win32 Release" -f install.mak clean
cd ..\..\..
installdll:
cd os\win32\installer\installdll
nmake /nologo CFG="install - Win32 Release" -f install.mak
cd ..\..\..
1.1 apache-1.3/src/Makefile_win32_debug.txt
Index: Makefile_win32_debug.txt
===================================================================
# Makefile for Windows NT and Windows 95
# Targets are:
# _apache - build Apache in Debug mode
# install - build and install a Debug build
# clean - remove (most) files generated by a Debug build
#
# The default installation directory is \Apache. This can be changed
# with the INSTDIR macro, for example:
#
# nmake /f Makefile_win32_debug.txt INSTDIR="d:\Program Files\Apache"
install
#
# Note: this does *NOT* change the compiled in default "server root"
!IF "$(INSTDIR)" == ""
INSTDIR=\Apache
!MESSAGE Using default install directory \Apache
!ENDIF
default: _apache
_apache: _build
install: _build _install
_build:
cd os\win32
nmake /nologo CFG="ApacheOS - Win32 Debug" -f ApacheOS.mak
cd ..\..
cd regex
nmake /nologo CFG="regex - Win32 Debug" -f regex.mak
cd ..
cd ap
nmake /nologo CFG="ap - Win32 Debug" -f ap.mak
cd ..
cd main
nmake /nologo CFG="gen_uri_delims - Win32 Debug" -f gen_uri_delims.mak
nmake /nologo CFG="gen_test_char - Win32 Debug" -f gen_test_char.mak
cd ..
-del CoreD\buildmark.obj
nmake /nologo CFG="ApacheCore - Win32 Debug" -f ApacheCore.mak
nmake /nologo CFG="Apache - Win32 Debug" -f Apache.mak
cd os\win32
set CFG=ApacheModuleStatus - Win32 Debug
nmake /nologo CFG="ApacheModuleStatus - Win32 Debug" -f
ApacheModuleStatus.mak
# nmake /nologo CFG ""/nologo -f
ApacheModuleStatus.mak"=ApacheModuleInfo - Win32 Debug" -f ApacheModuleInfo.mak
nmake /nologo CFG="ApacheModuleAuthAnon - Win32 Debug" -f
ApacheModuleAuthAnon.mak
nmake /nologo CFG="ApacheModuleDigest - Win32 Debug" -f
ApacheModuleDigest.mak
nmake /nologo CFG="ApacheModuleCERNMeta - Win32 Debug" -f
ApacheModuleCERNMeta.mak
nmake /nologo CFG="ApacheModuleExpires - Win32 Debug" -f
ApacheModuleExpires.mak
nmake /nologo CFG="ApacheModuleHeaders - Win32 Debug" -f
ApacheModuleHeaders.mak
nmake /nologo CFG="ApacheModuleSpeling - Win32 Debug" -f
ApacheModuleSpeling.mak
nmake /nologo CFG="ApacheModuleUserTrack - Win32 Debug" -f
ApacheModuleUserTrack.mak
nmake /nologo CFG="ApacheModuleRewrite - Win32 Debug" -f
ApacheModuleRewrite.mak
cd ..\..
cd modules\proxy
nmake /nologo CFG="ApacheModuleProxy - Win32 Debug" -f
ApacheModuleProxy.mak
cd ..\..
_install:
-mkdir $(INSTDIR)
-mkdir $(INSTDIR)\modules
-mkdir $(INSTDIR)\logs
-mkdir $(INSTDIR)\conf
copy ApacheD\Apache.exe $(INSTDIR)
copy CoreD\ApacheCore.dll $(INSTDIR)
copy os\win32\ApacheModuleStatusD\ApacheModuleStatus.dll
$(INSTDIR)\modules
# copy os\win32\ApacheModuleInfoD\ApacheModuleInfo.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleAuthAnonD\ApacheModuleAuthAnon.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleDigestD\ApacheModuleDigest.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleCERNMetaD\ApacheModuleCERNMeta.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleExpiresD\ApacheModuleExpires.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleHeadersD\ApacheModuleHeaders.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleRewriteD\ApacheModuleRewrite.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleSpelingD\ApacheModuleSpeling.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll
$(INSTDIR)\modules
copy modules\proxy\Debug\ApacheModuleProxy.dll $(INSTDIR)\modules
clean:
cd os\win32
nmake /nologo CFG="ApacheOS - Win32 Debug" -f ApacheOS.mak clean
cd ..\..
cd regex
nmake /nologo CFG="regex - Win32 Debug" -f regex.mak clean
cd ..
cd ap
nmake /nologo CFG="ap - Win32 Debug" -f ap.mak clean
cd ..
cd main
nmake /nologo CFG="gen_uri_delims - Win32 Debug" -f gen_uri_delims.mak
clean
del uri_delims.h
nmake /nologo CFG="gen_test_char - Win32 Debug" -f gen_test_char.mak
clean
del test_char.h
cd ..
nmake /nologo CFG="ApacheCore - Win32 Debug" -f ApacheCore.mak clean
nmake /nologo CFG="Apache - Win32 Debug" -f Apache.mak clean
cd os\win32
nmake /nologo CFG="ApacheModuleStatus - Win32 Debug" -f
ApacheModuleStatus.mak clean
# nmake /nologo CFG="ApacheModuleInfo - Win32 Debug" -f
ApacheModuleInfo.mak clean
nmake /nologo CFG="ApacheModuleAuthAnon - Win32 Debug" -f
ApacheModuleAuthAnon.mak clean
nmake /nologo CFG="ApacheModuleDigest - Win32 Debug" -f
ApacheModuleDigest.mak clean
nmake /nologo CFG="ApacheModuleCERNMeta - Win32 Debug" -f
ApacheModuleCERNMeta.mak clean
nmake /nologo CFG="ApacheModuleExpires - Win32 Debug" -f
ApacheModuleExpires.mak clean
nmake /nologo CFG="ApacheModuleHeaders - Win32 Debug" -f
ApacheModuleHeaders.mak clean
nmake /nologo CFG="ApacheModuleSpeling - Win32 Debug" -f
ApacheModuleSpeling.mak clean
nmake /nologo CFG="ApacheModuleUserTrack - Win32 Debug" -f
ApacheModuleUserTrack.mak clean
nmake /nologo CFG="ApacheModuleRewrite - Win32 Debug" -f
ApacheModuleRewrite.mak clean
cd ..\..
cd modules\proxy
nmake /nologo CFG="ApacheModuleProxy - Win32 Debug" -f
ApacheModuleProxy.mak clean
cd ..\..
cd os\win32\installer\installdll
nmake /nologo CFG="install - Win32 Debug" -f install.mak clean
cd ..\..\..
installdll:
cd os\win32\installer\installdll
nmake /nologo CFG="install - Win32 Debug" -f install.mak
cd ..\..\..
