Enable httxt2dbm, mod_dumpio in the build, which were

long neglected but certainly work under win32.

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

diff --git a/Apache.dsw b/Apache.dsw
index ce42ea6ee695da5091155a3c1d2712acd149db96..f9064c64f01bbd92a720f68a1c75504d3b9658d9 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -111,6 +111,9 @@ Package=<4>
     Project_Dep_Name mod_disk_cache
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_dumpio
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_env
     End Project Dependency
     Begin Project Dependency
@@ -207,6 +210,9 @@ Package=<4>
     Project_Dep_Name htpasswd
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name httxt2dbm
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name logresolve
     End Project Dependency
     Begin Project Dependency
@@ -408,6 +414,24 @@ Package=<4>
 
 ###############################################################################
 
+Project: "httxt2dbm"=".\support\httxt2dbm.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "libapr"=".\srclib\apr\libapr.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -969,6 +993,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_dumpio"=".\modules\experimental\mod_dumpio.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_echo"=".\modules\echo\mod_echo.dsp" - Package Owner=<4>
 
 Package=<5>

diff --git a/Makefile.win b/Makefile.win
index 53b0cd9508fb1cc4bdd6644f126b50e8fd26fc07..a7e44fd04c44dc8eb4402f77b95a6e7d2bcb2e05 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -237,9 +237,10 @@ _build:
        cd ..\..\..
        cd modules\experimental
         $(MAKE) $(MAKEOPT) -f mod_cache.mak       CFG="mod_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak   CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak  CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak   CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_dumpio.mak      CFG="mod_dumpio - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f util_ldap.mak       CFG="util_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_auth_ldap.mak   CFG="mod_auth_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
@@ -306,6 +307,7 @@ _build:
         $(MAKE) $(MAKEOPT) -f htdbm.mak           CFG="htdbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f htdigest.mak        CFG="htdigest - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f htpasswd.mak        CFG="htpasswd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f httxt2dbm.mak       CFG="httxt2dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f logresolve.mak      CFG="logresolve - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f rotatelogs.mak      CFG="rotatelogs - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..
@@ -380,9 +382,10 @@ _copybin:
        copy modules\dav\fs\$(LONG)\mod_dav_fs.$(src_so)        "$(inst_so)" <.y
        copy modules\dav\main\$(LONG)\mod_dav.$(src_so)         "$(inst_so)" <.y
        copy modules\experimental\$(LONG)\mod_cache.$(src_so)           "$(inst_so)" <.y
-       copy modules\experimental\$(LONG)\mod_charset_lite.$(src_so)    "$(inst_so)" <.y
-       copy modules\experimental\$(LONG)\mod_mem_cache.$(src_so)       "$(inst_so)" <.y
        copy modules\experimental\$(LONG)\mod_disk_cache.$(src_so)      "$(inst_so)" <.y
+       copy modules\experimental\$(LONG)\mod_mem_cache.$(src_so)       "$(inst_so)" <.y
+       copy modules\experimental\$(LONG)\mod_charset_lite.$(src_so)    "$(inst_so)" <.y
+       copy modules\experimental\$(LONG)\mod_dumpio.$(src_so)          "$(inst_so)" <.y
        copy modules\experimental\$(LONG)\util_ldap.$(src_so)           "$(inst_so)" <.y
        copy modules\experimental\$(LONG)\mod_auth_ldap.$(src_so)       "$(inst_so)" <.y
 !IF EXIST("srclib\zlib")
@@ -433,6 +436,7 @@ _copybin:
        copy support\$(LONG)\htdbm.$(src_exe)                   "$(inst_exe)" <.y
        copy support\$(LONG)\htdigest.$(src_exe)                "$(inst_exe)" <.y
        copy support\$(LONG)\htpasswd.$(src_exe)                "$(inst_exe)" <.y
+       copy support\$(LONG)\httxt2dbm.$(src_exe)               "$(inst_exe)" <.y
        copy support\$(LONG)\logresolve.$(src_exe)              "$(inst_exe)" <.y
        copy support\$(LONG)\rotatelogs.$(src_exe)              "$(inst_exe)" <.y
        copy support\win32\$(LONG)\ApacheMonitor.$(src_exe)     "$(inst_exe)" <.y

diff --git a/modules/experimental/mod_dumpio.dsp b/modules/experimental/mod_dumpio.dsp
index 3f88cf86f4bb7e393061f7d48da40c76a24fb735..1126ddc97669a918e9c06ea483be580d5572cd99 100644 (file)
--- a/modules/experimental/mod_dumpio.dsp
+++ b/modules/experimental/mod_dumpio.dsp
@@ -106,7 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk
 InputPath=..\..\build\win32\win32ver.awk
 
 ".\mod_dumpio.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk mod_dumpio.so "bucketeer_module for Apache" ../../include/ap_release.h > .\mod_dumpio.rc
+       awk -f ../../build/win32/win32ver.awk mod_dumpio.so "dumpio_module for Apache" ../../include/ap_release.h > .\mod_dumpio.rc
 
 # End Custom Build
 
@@ -117,7 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk
 InputPath=..\..\build\win32\win32ver.awk
 
 ".\mod_dumpio.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk mod_dumpio.so "bucketeer_module for Apache" ../../include/ap_release.h > .\mod_dumpio.rc
+       awk -f ../../build/win32/win32ver.awk mod_dumpio.so "dumpio_module for Apache" ../../include/ap_release.h > .\mod_dumpio.rc
 
 # End Custom Build
 

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 01e5954a95812d8dd3abaf7fd7213dfa7d73e200..f63c7bef9c744654d6b7775485df703148a15bc0 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -61,3 +61,4 @@ mod_log_forensic.so     0x6FB40000    0x00010000
 mod_bucketeer.so        0x6FB30000    0x00010000
 mod_echo.so             0x6FB20000    0x00010000
 mod_version.so          0x6FB10000    0x00010000
+mod_dumpio.so           0x6FB00000    0x00010000

diff --git a/support/httxt2dbm.dsp b/support/httxt2dbm.dsp
new file mode 100644 (file)
index 0000000..53b7830
--- /dev/null
+++ b/support/httxt2dbm.dsp
@@ -0,0 +1,123 @@
+# Microsoft Developer Studio Project File - Name="httxt2dbm" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=httxt2dbm - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "httxt2dbm.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "httxt2dbm.mak" CFG="httxt2dbm - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "httxt2dbm - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "httxt2dbm - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "httxt2dbm - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../srclib/apr/include" /I "../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Release/httxt2dbm_src" /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /debug /opt:ref
+
+!ELSEIF  "$(CFG)" == "httxt2dbm - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/httxt2dbm_src" /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
+
+!ENDIF 
+
+# Begin Target
+
+# Name "httxt2dbm - Win32 Release"
+# Name "httxt2dbm - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\httxt2dbm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\httxt2dbm.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\build\win32\win32ver.awk
+
+!IF  "$(CFG)" == "httxt2dbm - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\build\win32\win32ver.awk
+
+".\httxt2dbm.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       awk -f ../build/win32/win32ver.awk httxt2dbm.exe "httxt2dbm Utility"  ../include/ap_release.h > .\httxt2dbm.rc
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "httxt2dbm - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\build\win32\win32ver.awk
+
+".\httxt2dbm.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       awk -f ../build/win32/win32ver.awk httxt2dbm.exe "httxt2dbm Utility"  ../include/ap_release.h > .\httxt2dbm.rc
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project