httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r901539 - in /httpd/httpd/trunk: Apache.dsw Makefile.win
Date Thu, 21 Jan 2010 05:56:26 GMT
Author: wrowe
Date: Thu Jan 21 05:56:18 2010
New Revision: 901539

URL: http://svn.apache.org/viewvc?rev=901539&view=rev
Log:
Add mod_serf to the win32 build

Modified:
    httpd/httpd/trunk/Apache.dsw
    httpd/httpd/trunk/Makefile.win

Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache.dsw?rev=901539&r1=901538&r2=901539&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Thu Jan 21 05:56:18 2010
@@ -2565,6 +2565,31 @@
 
 ###############################################################################
 
+Project: "mod_proxy_serf"=.\modules\proxy\mod_proxy_serf.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
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+}}}
+
+
+###############################################################################
+
 Project: "mod_ratelimit"=.\modules\filters\mod_ratelimit.dsp - Package Owner=<4>
 
 Package=<5>

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=901539&r1=901538&r2=901539&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Thu Jan 21 05:56:18 2010
@@ -129,11 +129,17 @@
 	cd modules\filters
 	$(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..
+	cd modules\proxy
+	$(MAKE) $(MAKEOPT) -f mod_serf.mak CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	cd ..\..
 !ELSEIF $(USESLN) == 1
 	devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_deflate
+	devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_serf
 !ELSE
 	@msdev Apache.dsw /USEENV /MAKE \
 		"mod_deflate - Win32 $(LONG)" /NORECURSE $(CTARGET)
+	@msdev Apache.dsw /USEENV /MAKE \
+		"mod_serf - Win32 $(LONG)" /NORECURSE $(CTARGET)
 !ENDIF
 
 !ELSE
@@ -141,7 +147,7 @@
 
 _tryzlib:
 	@echo -----
-	@echo mod_deflate will not build unless zlib is installed in srclib\zlib.  
+	@echo mod_deflate and mod_serf will not build unless zlib is built in srclib\zlib.  
 	@echo Version 1.2.1 and later available from http://www.gzip.org/zlib/
 	@echo built w/ nmake -f win32/Makefile.msc will satisfy this requirement.
 
@@ -460,6 +466,9 @@
 	 $(MAKE) $(MAKEOPT) -f mod_proxy_ftp.mak   CFG="mod_proxy_ftp - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_proxy_http.mak  CFG="mod_proxy_http - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_proxy_scgi.mak  CFG="mod_proxy_scgi - Win32 $(LONG)" RECURSE=0
$(CTARGET)
+!IF EXIST("srclib\zlib")
+	 $(MAKE) $(MAKEOPT) -f mod_serf.mak        CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+!ENDIF
 	cd ..\..
 	cd modules\proxy\balancers
 	 $(MAKE) $(MAKEOPT) -f mod_lbmethod_bybusyness.mak CFG="mod_lbmethod_bybusyness - Win32
$(LONG)" RECURSE=0 $(CTARGET)



Mime
View raw message