Fix PR 12706 for users on very fast boxen who seem to have issues with

  the 'post-build' logic to create uri_delims.h and test_char.h.  Also
  note the .pdb debug symbol patch from last week.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@100078 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ApacheCore.dsp b/src/ApacheCore.dsp
index 30aa892a226a58f5c562be15c7480408630b6c86..d0c4de42b6e2744111ed84da531d9107910c190f 100644 (file)
--- a/src/ApacheCore.dsp
+++ b/src/ApacheCore.dsp
@@ -390,6 +390,64 @@ SOURCE=.\include\util_uri.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\main\gen_test_char.exe
+
+!IF  "$(CFG)" == "ApacheCore - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating test_char.h from gen_test_char.exe
+InputPath=.\main\gen_test_char.exe
+
+".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       .\main\gen_test_char.exe >.\main\test_char.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating test_char.h from gen_test_char.exe
+InputPath=.\main\gen_test_char.exe
+
+".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       .\main\gen_test_char.exe >.\main\test_char.h
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\main\gen_uri_delims.exe
+
+!IF  "$(CFG)" == "ApacheCore - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating uri_delims.h from gen_uri_delims.exe
+InputPath=.\main\gen_uri_delims.exe
+
+".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       .\main\gen_uri_delims.exe >.\main\uri_delims.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating uri_delims.h from gen_uri_delims.exe
+InputPath=.\main\gen_uri_delims.exe
+
+".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       .\main\gen_uri_delims.exe >.\main\uri_delims.h
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\main\test_char.h
 # End Source File
 # Begin Source File

diff --git a/src/CHANGES b/src/CHANGES
index dc0dbd040fb753df713ff9c179e4475c27c0b455..3d1cb8d8040d18ffb05bef85993101b99dd434c1 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,17 @@
 Changes with Apache 1.3.28
 
+  *) Win32 build system changes; always recompile buildmark.c (used for
+     Apache -v 'server built' messages) even when Apache is built from
+     within the IDE; build test_char.h and uri_delims.h from within the
+     ApacheCore.dsp project.  PR 12706.  [William Rowe]
+
+  *) Introduce Win32 .pdb diagnostic symbols into the Apache 1.3 build
+     (as created in Apache 2.0.45 and later.)  Makes debugging and
+     analysis of crash dumps and Dr. Watson logs trivial.  Requires the
+     Win32 binary builder to set aside the exact .pdb files that match
+     the released binaries (.exe/.so files) for reference by users and 
+     developers.  [William Rowe]
+
   *) Make sure the accept mutex is released before calling child exit
      hooks and cleanups.  Otherwise, modules can segfault in such code
      and, with pthread mutexes, leave the server deadlocked.  Even if

diff --git a/src/main/gen_test_char.dsp b/src/main/gen_test_char.dsp
index d76b207fe2a6fc472c4a530f9a41abdefadb5a10..463edf47201f97b1d1cba88b57e2a2cffe91f0c5 100644 (file)
--- a/src/main/gen_test_char.dsp
+++ b/src/main/gen_test_char.dsp
@@ -51,11 +51,6 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:console /incremental:no /pdb:"Release\gen_test_char.pdb" /machine:I386
 # ADD LINK32 /nologo /subsystem:console /incremental:no /pdb:"Release\gen_test_char.pdb" /machine:I386
-# Begin Special Build Tool
-SOURCE=$(InputPath)
-PostBuild_Desc=Create test_char.h
-PostBuild_Cmds=.\gen_test_char > test_char.h
-# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
 
@@ -80,11 +75,6 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:console /incremental:no /pdb:"Debug\gen_test_char.pdb" /debug /machine:I386
 # ADD LINK32 /nologo /subsystem:console /incremental:no /pdb:"Debug\gen_test_char.pdb" /debug /machine:I386
-# Begin Special Build Tool
-SOURCE=$(InputPath)
-PostBuild_Desc=Create test_char.h
-PostBuild_Cmds=.\gen_test_char > test_char.h
-# End Special Build Tool
 
 !ENDIF 
 

diff --git a/src/main/gen_uri_delims.dsp b/src/main/gen_uri_delims.dsp
index f89a707b8e063df40e4e3f84b1d37f6a15e4b5de..5b7369de56a335980e9ba087c89490450b5d1f67 100644 (file)
--- a/src/main/gen_uri_delims.dsp
+++ b/src/main/gen_uri_delims.dsp
@@ -51,11 +51,6 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:console /incremental:no /pdb:"Debug\gen_uri_delims.pdb" /machine:I386
 # ADD LINK32 /nologo /subsystem:console /incremental:no /pdb:"Release\gen_uri_delims.pdb" /machine:I386
-# Begin Special Build Tool
-SOURCE=$(InputPath)
-PostBuild_Desc=Create uri_delims.h
-PostBuild_Cmds=.\gen_uri_delims > uri_delims.h
-# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "gen_uri_delims - Win32 Debug"
 
@@ -80,11 +75,6 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:console /incremental:no /pdb:"Debug\gen_uri_delims.pdb" /debug /machine:I386
 # ADD LINK32 /nologo /subsystem:console /incremental:no /pdb:"Debug\gen_uri_delims.pdb" /debug /machine:I386
-# Begin Special Build Tool
-SOURCE=$(InputPath)
-PostBuild_Desc=Create uri_delims.h
-PostBuild_Cmds=.\gen_uri_delims > uri_delims.h
-# End Special Build Tool
 
 !ENDIF