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 2008/11/23 23:49:31 UTC
svn commit: r720062 - in /httpd/httpd/trunk: Apache.dsw Makefile.win
modules/filters/mod_sed.dsp os/win32/BaseAddr.ref
Author: wrowe
Date: Sun Nov 23 14:49:30 2008
New Revision: 720062
URL: http://svn.apache.org/viewvc?rev=720062&view=rev
Log:
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.
Modified:
httpd/httpd/trunk/Apache.dsw
httpd/httpd/trunk/Makefile.win
httpd/httpd/trunk/modules/filters/mod_sed.dsp
httpd/httpd/trunk/os/win32/BaseAddr.ref
Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache.dsw?rev=720062&r1=720061&r2=720062&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Sun Nov 23 14:49:30 2008
@@ -267,6 +267,9 @@
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 @@
###############################################################################
+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>
Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=720062&r1=720061&r2=720062&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Sun Nov 23 14:49:30 2008
@@ -348,6 +348,7 @@
$(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 @@
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
Modified: httpd/httpd/trunk/modules/filters/mod_sed.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_sed.dsp?rev=720062&r1=720061&r2=720062&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_sed.dsp (original)
+++ httpd/httpd/trunk/modules/filters/mod_sed.dsp Sun Nov 23 14:49:30 2008
@@ -101,10 +101,34 @@
# Name "mod_sed - Win32 Debug"
# Begin Source File
+SOURCE=.\libsed.h
+# End Source File
+# Begin Source File
+
SOURCE=.\mod_sed.c
# End Source File
# Begin Source File
+SOURCE=.\regexp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\regexp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\sed.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\sed0.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sed1.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\build\win32\httpd.rc
# End Source File
# End Target
Modified: httpd/httpd/trunk/os/win32/BaseAddr.ref
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/BaseAddr.ref?rev=720062&r1=720061&r2=720062&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/trunk/os/win32/BaseAddr.ref Sun Nov 23 14:49:30 2008
@@ -95,3 +95,4 @@
mod_socache_dc.so 0x6F8A0000 0x00010000
mod_socache_memcache.so 0x6F890000 0x00010000
mod_socache_shmcb.so 0x6F880000 0x00010000
+mod_sed.so 0x6F870000 0x00010000