pcs 98/03/30 05:27:42
Modified: src ApacheCore.dsp ApacheCore.mak Makefile.nt
Log:
Re-enable Win32 build. New makefiles (and projects) build the
gen_uri_delims and get_test_char programs, and run them to
create the appropriate .h files. The ApacheCore makefile/project have
these files are "Generated" files (just so we don't try to edit them
too much). Update Makefile.nt to build/clean these new makefiles.
Revision Changes Path
1.25 +20 -4 apache-1.3/src/ApacheCore.dsp
Index: ApacheCore.dsp
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.dsp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ApacheCore.dsp 1998/03/14 21:09:54 1.24
+++ ApacheCore.dsp 1998/03/30 13:27:39 1.25
@@ -118,10 +118,6 @@
# End Source File
# Begin Source File
-SOURCE=.\main\http_bprintf.c
-# End Source File
-# Begin Source File
-
SOURCE=.\main\http_config.c
# End Source File
# Begin Source File
@@ -392,10 +388,30 @@
SOURCE=.\include\util_script.h
# End Source File
+# Begin Source File
+
+SOURCE=.\include\util_uri.h
+# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Group "Generated Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\hide.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\main\test_char.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\main\uri_delims.h
+# End Source File
# End Group
# End Target
# End Project
1.35 +55 -87 apache-1.3/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.mak,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ApacheCore.mak 1998/03/14 21:09:54 1.34
+++ ApacheCore.mak 1998/03/30 13:27:40 1.35
@@ -56,7 +56,6 @@
[EMAIL PROTECTED] "$(INTDIR)\buildmark.obj"
[EMAIL PROTECTED] "$(INTDIR)\fnmatch.obj"
[EMAIL PROTECTED] "$(INTDIR)\getopt.obj"
- [EMAIL PROTECTED] "$(INTDIR)\http_bprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\http_config.obj"
[EMAIL PROTECTED] "$(INTDIR)\http_core.obj"
[EMAIL PROTECTED] "$(INTDIR)\http_log.obj"
@@ -128,7 +127,6 @@
"$(INTDIR)\buildmark.obj" \
"$(INTDIR)\fnmatch.obj" \
"$(INTDIR)\getopt.obj" \
- "$(INTDIR)\http_bprintf.obj" \
"$(INTDIR)\http_config.obj" \
"$(INTDIR)\http_core.obj" \
"$(INTDIR)\http_log.obj" \
@@ -202,8 +200,6 @@
[EMAIL PROTECTED] "$(INTDIR)\fnmatch.sbr"
[EMAIL PROTECTED] "$(INTDIR)\getopt.obj"
[EMAIL PROTECTED] "$(INTDIR)\getopt.sbr"
- [EMAIL PROTECTED] "$(INTDIR)\http_bprintf.obj"
- [EMAIL PROTECTED] "$(INTDIR)\http_bprintf.sbr"
[EMAIL PROTECTED] "$(INTDIR)\http_config.obj"
[EMAIL PROTECTED] "$(INTDIR)\http_config.sbr"
[EMAIL PROTECTED] "$(INTDIR)\http_core.obj"
@@ -306,7 +302,6 @@
"$(INTDIR)\buildmark.sbr" \
"$(INTDIR)\fnmatch.sbr" \
"$(INTDIR)\getopt.sbr" \
- "$(INTDIR)\http_bprintf.sbr" \
"$(INTDIR)\http_config.sbr" \
"$(INTDIR)\http_core.sbr" \
"$(INTDIR)\http_log.sbr" \
@@ -366,7 +361,6 @@
"$(INTDIR)\buildmark.obj" \
"$(INTDIR)\fnmatch.obj" \
"$(INTDIR)\getopt.obj" \
- "$(INTDIR)\http_bprintf.obj" \
"$(INTDIR)\http_config.obj" \
"$(INTDIR)\http_core.obj" \
"$(INTDIR)\http_log.obj" \
@@ -463,13 +457,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_ALLOC=\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
@@ -483,6 +470,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\httpd.h"\
@@ -516,13 +504,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_BUFF_=\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)"
@@ -536,6 +517,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\http_main.h"\
@@ -586,6 +568,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
@@ -609,11 +592,6 @@
".\include\hide.h"\
".\include\hsregex.h"\
".\os\win32\os.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_FNMAT=\
- ".\include\os.h"\
"$(INTDIR)\fnmatch.obj" : $(SOURCE) $(DEP_CPP_FNMAT) "$(INTDIR)"
@@ -625,6 +603,7 @@
DEP_CPP_FNMAT=\
".\include\conf.h"\
".\include\fnmatch.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\os\win32\os.h"\
@@ -654,60 +633,11 @@
!ENDIF
-SOURCE=.\main\http_bprintf.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
-DEP_CPP_HTTP_=\
- ".\include\alloc.h"\
- ".\include\ap.h"\
- ".\include\buff.h"\
- ".\include\conf.h"\
- ".\include\hide.h"\
- ".\include\hsregex.h"\
- ".\include\httpd.h"\
- ".\include\util_uri.h"\
- ".\os\win32\os.h"\
- ".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_=\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
-
-"$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-
-DEP_CPP_HTTP_=\
- ".\include\alloc.h"\
- ".\include\ap.h"\
- ".\include\buff.h"\
- ".\include\conf.h"\
- ".\include\hsregex.h"\
- ".\include\httpd.h"\
- ".\include\util_uri.h"\
- ".\os\win32\os.h"\
- ".\os\win32\readdir.h"\
-
-
-"$(INTDIR)\http_bprintf.obj" "$(INTDIR)\http_bprintf.sbr" : $(SOURCE)\
- $(DEP_CPP_HTTP_) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\main\http_config.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
-DEP_CPP_HTTP_C=\
+DEP_CPP_HTTP_=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\buff.h"\
@@ -728,24 +658,25 @@
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_HTTP_C=\
+NODEP_CPP_HTTP_=\
".\include\ebcdic.h"\
".\include\os.h"\
".\include\sfio.h"\
-"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
+"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_HTTP_C=\
+DEP_CPP_HTTP_=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
".\include\explain.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -760,7 +691,7 @@
"$(INTDIR)\http_config.obj" "$(INTDIR)\http_config.sbr" : $(SOURCE)\
- $(DEP_CPP_HTTP_C) "$(INTDIR)"
+ $(DEP_CPP_HTTP_) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -770,7 +701,7 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
-DEP_CPP_HTTP_CO=\
+DEP_CPP_HTTP_C=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\buff.h"\
@@ -797,24 +728,25 @@
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_HTTP_CO=\
+NODEP_CPP_HTTP_C=\
".\include\ebcdic.h"\
".\include\os.h"\
".\include\sfio.h"\
-"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)"
+"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_HTTP_CO=\
+DEP_CPP_HTTP_C=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
".\include\fnmatch.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -835,7 +767,7 @@
"$(INTDIR)\http_core.obj" "$(INTDIR)\http_core.sbr" : $(SOURCE)\
- $(DEP_CPP_HTTP_CO) "$(INTDIR)"
+ $(DEP_CPP_HTTP_C) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -880,6 +812,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -949,6 +882,7 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\explain.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -1021,6 +955,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -1088,6 +1023,7 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\fnmatch.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1149,6 +1085,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -1193,6 +1130,7 @@
DEP_CPP_MD5C_=\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\md5.h"\
".\os\win32\os.h"\
@@ -1244,6 +1182,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1304,6 +1243,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1361,6 +1301,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -1417,6 +1358,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_log.h"\
@@ -1476,6 +1418,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1536,6 +1479,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1600,6 +1544,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -1664,6 +1609,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1721,6 +1667,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -1778,6 +1725,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1843,6 +1791,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1904,6 +1853,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1962,6 +1912,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -2015,6 +1966,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -2022,9 +1974,6 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
-NODEP_CPP_MOD_M=\
- ".\modules\standard\mod_mime.h"\
-
"$(INTDIR)\mod_mime.obj" "$(INTDIR)\mod_mime.sbr" : $(SOURCE)
$(DEP_CPP_MOD_M)\
"$(INTDIR)"
@@ -2073,6 +2022,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -2130,6 +2080,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -2184,6 +2135,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_log.h"\
@@ -2236,6 +2188,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -2286,6 +2239,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -2323,6 +2277,7 @@
DEP_CPP_MULTI=\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\multithread.h"\
".\os\win32\os.h"\
@@ -2396,6 +2351,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\httpd.h"\
@@ -2449,6 +2405,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\http_main.h"\
@@ -2506,6 +2463,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_log.h"\
@@ -2541,6 +2499,7 @@
".\include\http_log.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
+ ".\main\test_char.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
{$(INCLUDE)}"sys\stat.h"\
@@ -2563,11 +2522,13 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_log.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
+ ".\main\test_char.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -2604,6 +2565,7 @@
DEP_CPP_UTIL_D=\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\util_date.h"\
".\os\win32\os.h"\
@@ -2653,6 +2615,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\md5.h"\
@@ -2713,6 +2676,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -2751,6 +2715,7 @@
".\include\http_log.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
+ ".\main\uri_delims.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
{$(INCLUDE)}"sys\stat.h"\
@@ -2773,11 +2738,13 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_log.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
+ ".\main\uri_delims.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -2823,6 +2790,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
1.26 +10 -0 apache-1.3/src/Makefile.nt
Index: Makefile.nt
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile.nt,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.nt 1998/03/25 10:38:49 1.25
+++ Makefile.nt 1998/03/30 13:27:41 1.26
@@ -55,6 +55,10 @@
cd ap
nmake /nologo CFG="ap - Win32 %LONG%" -f ap.mak
cd ..
+ cd main
+ nmake /nologo CFG="gen_uri_delims - Win32 %LONG%" -f gen_uri_delims.mak
+ nmake /nologo CFG="gen_test_char - Win32 %LONG%" -f gen_test_char.mak
+ cd ..
-del Core%SHORT%\buildmark.obj
nmake /nologo CFG="ApacheCore - Win32 %LONG%" -f ApacheCore.mak
nmake /nologo CFG="Apache - Win32 %LONG%" -f Apache.mak
@@ -103,6 +107,12 @@
cd ..
cd ap
nmake /nologo CFG="ap - Win32 %LONG%" -f ap.mak clean
+ cd ..
+ cd main
+ nmake /nologo CFG="gen_uri_delims - Win32 %LONG%" -f
gen_uri_delims.mak clean
+ del uri_delims.h
+ nmake /nologo CFG="gen_test_char - Win32 %LONG%" -f gen_test_char.mak
clean
+ del test_char.h
cd ..
nmake /nologo CFG="ApacheCore - Win32 %LONG%" -f ApacheCore.mak clean
nmake /nologo CFG="Apache - Win32 %LONG%" -f Apache.mak clean
