httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r602708 - in /httpd/httpd/branches/2.2.x: Apache.dsw Makefile.win modules/filters/mod_substitute.dsp
Date Sun, 09 Dec 2007 18:09:59 GMT
Author: wrowe
Date: Sun Dec  9 10:09:58 2007
New Revision: 602708

URL: http://svn.apache.org/viewvc?rev=602708&view=rev
Log:
Complete r602684 backporting win32 build from trunk of mod_substitute.


Added:
    httpd/httpd/branches/2.2.x/modules/filters/mod_substitute.dsp
      - copied unchanged from r602704, httpd/httpd/trunk/modules/filters/mod_substitute.dsp
Modified:
    httpd/httpd/branches/2.2.x/Apache.dsw
    httpd/httpd/branches/2.2.x/Makefile.win

Modified: httpd/httpd/branches/2.2.x/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Apache.dsw?rev=602708&r1=602707&r2=602708&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Apache.dsw (original)
+++ httpd/httpd/branches/2.2.x/Apache.dsw Sun Dec  9 10:09:58 2007
@@ -255,6 +255,9 @@
     Project_Dep_Name mod_status
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_substitute
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_unique_id
     End Project Dependency
     Begin Project Dependency
@@ -2077,6 +2080,27 @@
 ###############################################################################
 
 Project: "mod_status"=.\modules\generators\mod_status.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_substitute"=.\modules\experimental\mod_substitute.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

Modified: httpd/httpd/branches/2.2.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Makefile.win?rev=602708&r1=602707&r2=602708&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.win (original)
+++ httpd/httpd/branches/2.2.x/Makefile.win Sun Dec  9 10:09:58 2007
@@ -297,6 +297,7 @@
 	 $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak  CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(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_substitute.mak  CFG="mod_substitute - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	cd ..\..
 	cd modules\generators
 	 $(MAKE) $(MAKEOPT) -f mod_asis.mak        CFG="mod_asis - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -432,6 +433,9 @@
 	copy srclib\apr\$(LONG)\libapr-1.$(src_dll) 		"$(inst_dll)" <.y
 	copy srclib\apr-iconv\$(LONG)\libapriconv-1.$(src_dll) 	"$(inst_dll)" <.y
 	copy srclib\apr-util\$(LONG)\libaprutil-1.$(src_dll) 	"$(inst_dll)" <.y
+!IF EXIST("srclib\zlib\zlib1.$(src_dll)")
+	copy srclib\zlib\zlib1.$(src_dll)		 	"$(inst_dll)" <.y
+!ENDIF
 	copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_auth_digest.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authn_alias.$(src_so) 	"$(inst_so)" <.y
@@ -469,13 +473,11 @@
 	copy modules\filters\$(LONG)\mod_charset_lite.$(src_so)	"$(inst_so)" <.y
 !IF EXIST("srclib\zlib")
 	copy modules\filters\$(LONG)\mod_deflate.$(src_so) 	"$(inst_so)" <.y
-!IF EXIST("srclib\zlib\zlib1.$(src_dll)")
-	copy srclib\zlib\zlib1.$(src_dll)		 	"$(inst_dll)" <.y
-!ENDIF
 !ENDIF
 	copy modules\filters\$(LONG)\mod_ext_filter.$(src_so) 	"$(inst_so)" <.y
 	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_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
 	copy modules\generators\$(LONG)\mod_cgi.$(src_so) 	"$(inst_so)" <.y



Mime
View raw message