So close ;-) Nicely done Jim

Add the sed sources to mod_sed, no different than the sed_obj
list from config.m4 (.h files just for easy reference).

Apache.dsw is simply sorted entries, and picking to drop
a new module under BuildBin (common) or BuildAll (test and
nonstandard extensions).  Give us mod_sed :)

Makefile.win is simply the invocation of the .mak file that
gets exported, and the copy of that module (pdb debugging)
binary.

Can't update BaseAddr.ref except from windows, however, we
have to build once and determine how many 64k pages this
object is going to eat.  Turns out, it's only one.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@720062 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.dsw b/Apache.dsw
index f240d96f53cb256ab73802bf97cb8df2a4cf381b..7afc9551ecaf19e9148fe39ebbad6648cde68c2d 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -267,6 +267,9 @@ Package=<4>
     Project_Dep_Name mod_rewrite
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_sed
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_session_cookie
     End Project Dependency
     Begin Project Dependency
@@ -2333,6 +2336,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_sed"=.\modules\filters\mod_sed.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_session"=.\modules\session\mod_session.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/Makefile.win b/Makefile.win
index c831506e8b3fa140012b42d09e584fba9bb18a42..d91bbc5ff77d1a063fc4b0f4ce8d1a141f31b843 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -348,6 +348,7 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_filter.mak      CFG="mod_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_include.mak     CFG="mod_include - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_request.mak     CFG="mod_request - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_sed.mak         CFG="mod_sed - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_substitute.mak  CFG="mod_substitute - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd modules\generators
@@ -556,6 +557,7 @@ _copybin:
        copy modules\filters\$(LONG)\mod_filter.$(src_so)       "$(inst_so)" <.y
        copy modules\filters\$(LONG)\mod_include.$(src_so)      "$(inst_so)" <.y
        copy modules\filters\$(LONG)\mod_request.$(src_so)      "$(inst_so)" <.y
+       copy modules\filters\$(LONG)\mod_sed.$(src_so)          "$(inst_so)" <.y
        copy modules\filters\$(LONG)\mod_substitute.$(src_so)   "$(inst_so)" <.y
        copy modules\generators\$(LONG)\mod_asis.$(src_so)      "$(inst_so)" <.y
        copy modules\generators\$(LONG)\mod_autoindex.$(src_so) "$(inst_so)" <.y

diff --git a/modules/filters/mod_sed.dsp b/modules/filters/mod_sed.dsp
index f72cafabeb744d4fddffb53486214e7e8f1b4deb..ec1e1a362c0498e3db41617daebd4a8a3fca57bb 100644 (file)
--- a/modules/filters/mod_sed.dsp
+++ b/modules/filters/mod_sed.dsp
@@ -101,10 +101,34 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma
 # Name "mod_sed - Win32 Debug"\r
 # Begin Source File\r
 \r
+SOURCE=.\libsed.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\mod_sed.c\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\regexp.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\regexp.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\sed.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\sed0.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\sed1.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\build\win32\httpd.rc\r
 # End Source File\r
 # End Target\r

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 323eb1cc9ad112650959ec9ff3258f85fd1511ea..72991ce3306b30f7bb86c0c205dcb757ffccd9fe 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -95,3 +95,4 @@ mod_socache_dbm.so      0x6F8B0000    0x00010000
 mod_socache_dc.so       0x6F8A0000    0x00010000
 mod_socache_memcache.so 0x6F890000    0x00010000
 mod_socache_shmcb.so    0x6F880000    0x00010000
+mod_sed.so              0x6F870000    0x00010000