A while ago I started working on main/config.w32.h beeing generated from main/config.w32.h.in.
The benefit of this is to allow for a Win32 build configuration that doesn't conflict with CVS versions, since only config.w32.h.in is only known to the repository. Anyways, my earlier version of this patch didn't work and config.w32.h was always overwritten during the build, rendering the mechanism useless. Attached is a patch that fixes this mess. I tested it, hopefully well enough, but would like a fresh pair of eyes to look over it before I commit it. -- Sebastian Bergmann http://sebastian-bergmann.de/ http://phpOpenTracker.de/ Did I help you? Consider a gift: http://wishlist.sebastian-bergmann.de/
Index: php4dll.dsp =================================================================== RCS file: /repository/php4/win32/php4dll.dsp,v retrieving revision 1.33 diff -u -r1.33 php4dll.dsp --- php4dll.dsp 5 Aug 2002 12:02:36 -0000 1.33 +++ php4dll.dsp 11 Sep 2002 08:34:02 -0000 @@ -240,8 +240,10 @@ # Begin Custom Build InputPath=..\main\config.w32.h.in -"..\main\config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy ..\main\config.w32.h.in ..\main\config.w32.h > nul +"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + if not exist ..\main\config.w32.h ( + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + ) # End Custom Build @@ -250,8 +252,10 @@ # Begin Custom Build InputPath=..\main\config.w32.h.in -"..\main\config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy ..\main\config.w32.h.in ..\main\config.w32.h > nul +"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + if not exist ..\main\config.w32.h ( + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + ) # End Custom Build @@ -260,8 +264,10 @@ # Begin Custom Build InputPath=..\main\config.w32.h.in -"..\main\config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy ..\main\config.w32.h.in ..\main\config.w32.h > nul +"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + if not exist ..\main\config.w32.h ( + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + ) # End Custom Build @@ -270,8 +276,10 @@ # Begin Custom Build InputPath=..\main\config.w32.h.in -"..\main\config.w32..inh" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy ..\main\config.w32.h.in ..\main\config.w32.h > nul +"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + if not exist ..\main\config.w32.h ( + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + ) # End Custom Build Index: php4dllts.dsp =================================================================== RCS file: /repository/php4/win32/php4dllts.dsp,v retrieving revision 1.80 diff -u -r1.80 php4dllts.dsp --- php4dllts.dsp 5 Sep 2002 13:36:32 -0000 1.80 +++ php4dllts.dsp 11 Sep 2002 08:34:03 -0000 @@ -273,8 +273,10 @@ # Begin Custom Build InputPath=..\main\config.w32.h.in -"..\main\config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy ..\main\config.w32.h.in ..\main\config.w32.h > nul +"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + if not exist ..\main\config.w32.h ( + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + ) # End Custom Build @@ -283,8 +285,10 @@ # Begin Custom Build InputPath=..\main\config.w32.h.in -"..\main\config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy ..\main\config.w32.h.in ..\main\config.w32.h > nul +"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + if not exist ..\main\config.w32.h ( + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + ) # End Custom Build @@ -293,8 +297,10 @@ # Begin Custom Build InputPath=..\main\config.w32.h.in -"..\main\config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy ..\main\config.w32.h.in ..\main\config.w32.h > nul +"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + if not exist ..\main\config.w32.h ( + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + ) # End Custom Build @@ -303,8 +309,10 @@ # Begin Custom Build InputPath=..\main\config.w32.h.in -"..\main\config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy ..\main\config.w32.h.in ..\main\config.w32.h > nul +"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + if not exist ..\main\config.w32.h ( + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + ) # End Custom Build
-- PHP Development Mailing List <http://www.php.net/> To unsubscribe, visit: http://www.php.net/unsub.php
