You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2004/04/13 00:18:20 UTC
cvs commit: apache-1.3/src/main gen_test_char.mak gen_uri_delims.mak
wrowe 2004/04/12 15:18:20
Modified: src ApacheCore.mak
src/main gen_test_char.mak gen_uri_delims.mak
Log:
uri_delims.h and test_char.h are now invoked as part of assembling
the apachecore, because post_build steps are ocassionaly quite flakey.
Brings these three .mak's in line with the .dsp's.
Revision Changes Path
1.54 +58 -4 apache-1.3/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /home/cvs/apache-1.3/src/ApacheCore.mak,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ApacheCore.mak 23 May 2003 03:39:01 -0000 1.53
+++ ApacheCore.mak 12 Apr 2004 22:18:19 -0000 1.54
@@ -206,11 +206,11 @@
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\ApacheCore.dll"
+ALL : ".\main\uri_delims.h" ".\main\test_char.h" "$(OUTDIR)\ApacheCore.dll"
!ELSE
-ALL : "Win9xConHook - Win32 Debug" "regex - Win32 Debug" "gen_uri_delims - Win32 Debug" "gen_test_char - Win32 Debug" "ApacheOS - Win32 Debug" "ap - Win32 Debug" "$(OUTDIR)\ApacheCore.dll"
+ALL : "Win9xConHook - Win32 Debug" "regex - Win32 Debug" "gen_uri_delims - Win32 Debug" "gen_test_char - Win32 Debug" "ApacheOS - Win32 Debug" "ap - Win32 Debug" ".\main\uri_delims.h" ".\main\test_char.h" "$(OUTDIR)\ApacheCore.dll"
!ENDIF
@@ -265,6 +265,8 @@
-@erase "$(OUTDIR)\ApacheCore.exp"
-@erase "$(OUTDIR)\ApacheCore.lib"
-@erase "$(OUTDIR)\ApacheCore.pdb"
+ -@erase ".\main\test_char.h"
+ -@erase ".\main\uri_delims.h"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -586,7 +588,7 @@
SOURCE=.\main\util.c
-"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)" ".\main\test_char.h"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -610,7 +612,7 @@
SOURCE=.\main\util_uri.c
-"$(INTDIR)\util_uri.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\util_uri.obj" : $(SOURCE) "$(INTDIR)" ".\main\uri_delims.h"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -619,6 +621,58 @@
"$(INTDIR)\util_win32.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+
+SOURCE=.\main\gen_test_char.exe
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+InputPath=.\main\gen_test_char.exe
+
+".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ <<tempfile.bat
+ @echo off
+ .\main\gen_test_char.exe >.\main\test_char.h
+<<
+
+
+!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+
+InputPath=.\main\gen_test_char.exe
+
+".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ <<tempfile.bat
+ @echo off
+ .\main\gen_test_char.exe >.\main\test_char.h
+<<
+
+
+!ENDIF
+
+SOURCE=.\main\gen_uri_delims.exe
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+InputPath=.\main\gen_uri_delims.exe
+
+".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ <<tempfile.bat
+ @echo off
+ .\main\gen_uri_delims.exe >.\main\uri_delims.h
+<<
+
+
+!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+
+InputPath=.\main\gen_uri_delims.exe
+
+".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ <<tempfile.bat
+ @echo off
+ .\main\gen_uri_delims.exe >.\main\uri_delims.h
+<<
+
+
+!ENDIF
!IF "$(CFG)" == "ApacheCore - Win32 Release"
1.15 +0 -28 apache-1.3/src/main/gen_test_char.mak
Index: gen_test_char.mak
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/gen_test_char.mak,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gen_test_char.mak 23 May 2003 03:39:01 -0000 1.14
+++ gen_test_char.mak 12 Apr 2004 22:18:20 -0000 1.15
@@ -92,20 +92,6 @@
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
-SOURCE="$(InputPath)"
-PostBuild_Desc=Create test_char.h
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-ALL : $(DS_POSTBUILD_DEP)
-
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-$(DS_POSTBUILD_DEP) : "$(OUTDIR)\gen_test_char.exe"
- .\gen_test_char > test_char.h
- echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
!ELSEIF "$(CFG)" == "gen_test_char - Win32 Debug"
OUTDIR=.
@@ -173,20 +159,6 @@
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
-
-SOURCE="$(InputPath)"
-PostBuild_Desc=Create test_char.h
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-ALL : $(DS_POSTBUILD_DEP)
-
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-$(DS_POSTBUILD_DEP) : "$(OUTDIR)\gen_test_char.exe"
- .\gen_test_char > test_char.h
- echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ENDIF
1.10 +0 -28 apache-1.3/src/main/gen_uri_delims.mak
Index: gen_uri_delims.mak
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/gen_uri_delims.mak,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gen_uri_delims.mak 23 May 2003 03:39:01 -0000 1.9
+++ gen_uri_delims.mak 12 Apr 2004 22:18:20 -0000 1.10
@@ -92,20 +92,6 @@
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
-SOURCE="$(InputPath)"
-PostBuild_Desc=Create uri_delims.h
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-ALL : $(DS_POSTBUILD_DEP)
-
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-$(DS_POSTBUILD_DEP) : "$(OUTDIR)\gen_uri_delims.exe"
- .\gen_uri_delims > uri_delims.h
- echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
!ELSEIF "$(CFG)" == "gen_uri_delims - Win32 Debug"
OUTDIR=.
@@ -173,20 +159,6 @@
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
-
-SOURCE="$(InputPath)"
-PostBuild_Desc=Create uri_delims.h
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-ALL : $(DS_POSTBUILD_DEP)
-
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-$(DS_POSTBUILD_DEP) : "$(OUTDIR)\gen_uri_delims.exe"
- .\gen_uri_delims > uri_delims.h
- echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ENDIF