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 2010/02/04 20:32:25 UTC
svn commit: r906612 - in /httpd/httpd/trunk: Makefile.win
os/win32/BaseAddr.ref
Author: wrowe
Date: Thu Feb 4 19:32:24 2010
New Revision: 906612
URL: http://svn.apache.org/viewvc?rev=906612&view=rev
Log:
Finish libserf magic
Modified:
httpd/httpd/trunk/Makefile.win
httpd/httpd/trunk/os/win32/BaseAddr.ref
Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=906612&r1=906611&r2=906612&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Thu Feb 4 19:32:24 2010
@@ -142,6 +142,8 @@
_tryserf:
@echo -----
@echo mod_serf will not build unless libserf.dll is built in srclib\serf
+ @echo For purposes of alpha, libserf release 0.3.0 works, but only with
+ @echo http://people.apache.org/~wrowe/fixserf-win32-0.3.0.patch
!ENDIF
# NOT EXIST("srclib\serf")
@@ -600,10 +602,12 @@
_copybin:
copy $(LONG)\httpd.$(src_exe) "$(inst_exe)" <.y
copy $(LONG)\libhttpd.$(src_dll) "$(inst_dll)" <.y
- 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
copy srclib\apr-util\ldap\$(LONG)\apr_ldap-1.$(src_dll) "$(inst_dll)" <.y
+!IF EXIST("srclib\serf")
+ copy srclib\serf\$(LONG)\libserf.$(src_dll) "$(inst_dll)" <.y
+!ENDIF
for %d in (odbc $(DBD_LIST)) do ( \
copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y \
)
@@ -714,6 +718,9 @@
copy modules\proxy\$(LONG)\mod_proxy_ftp.$(src_so) "$(inst_so)" <.y
copy modules\proxy\$(LONG)\mod_proxy_http.$(src_so) "$(inst_so)" <.y
copy modules\proxy\$(LONG)\mod_proxy_scgi.$(src_so) "$(inst_so)" <.y
+!IF EXIST("srclib\serf")
+ copy modules\proxy\$(LONG)\mod_serf.$(src_so) "$(inst_so)" <.y
+!ENDIF
copy modules\proxy\balancers\$(LONG)\mod_lbmethod_bybusyness.$(src_so) "$(inst_so)" <.y
copy modules\proxy\balancers\$(LONG)\mod_lbmethod_byrequests.$(src_so) "$(inst_so)" <.y
copy modules\proxy\balancers\$(LONG)\mod_lbmethod_bytraffic.$(src_so) "$(inst_so)" <.y
@@ -952,6 +959,9 @@
srclib\apr-util\xml\expat\lib\expat.h \
srclib\apr\include\*.h \
srclib\apr-util\include\*.h \
+!IF EXIST("srclib\serf")
+ srclib\serf\*.h \
+!ENDIF
include\*.h \
os\win32\os.h \
modules\cache\mod_cache.h \
@@ -981,6 +991,10 @@
copy srclib\apr-iconv\$(LONG)\libapriconv-1.exp "$(INSTDIR)\lib" <.y
copy srclib\apr-util\$(LONG)\libaprutil-1.lib "$(INSTDIR)\lib" <.y
copy srclib\apr-util\$(LONG)\libaprutil-1.exp "$(INSTDIR)\lib" <.y
+!IF EXIST("srclib\serf")
+ copy srclib\serf\$(LONG)\libserf.lib "$(INSTDIR)\lib" <.y
+ copy srclib\serf\$(LONG)\libserf.exp "$(INSTDIR)\lib" <.y
+!ENDIF
copy $(LONG)\libhttpd.exp "$(INSTDIR)\lib" <.y
copy $(LONG)\libhttpd.lib "$(INSTDIR)\lib" <.y
copy modules\dav\main\$(LONG)\mod_dav.exp "$(INSTDIR)\lib" <.y
Modified: httpd/httpd/trunk/os/win32/BaseAddr.ref
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/BaseAddr.ref?rev=906612&r1=906611&r2=906612&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/trunk/os/win32/BaseAddr.ref Thu Feb 4 19:32:24 2010
@@ -107,3 +107,4 @@
mod_heartmonitor.so 0x6F7E0000 0x00010000
mod_watchdog.so 0x6F7D0000 0x00010000
mod_proxy_scgi.so 0x6F7C0000 0x00010000
+mod_serf.so 0x6F7C0000 0x00010000
Re: svn commit: r906612 - in /httpd/httpd/trunk: Makefile.win
os/win32/BaseAddr.ref
Posted by Jeff Trawick <tr...@gmail.com>.
On Sun, Feb 7, 2010 at 9:23 PM, Gregg L. Smith <li...@glewis.com> wrote:
> Shouldn't this be a "B"?
> What's one more compiler warning among friends :-)
Fixed/thanks!
> wrowe@apache.org wrote:
>>
>> URL: http://svn.apache.org/viewvc?rev=906612&view=rev
>> Modified: httpd/httpd/trunk/os/win32/BaseAddr.ref
>> URL:
>> http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/BaseAddr.ref?rev=906612&r1=906611&r2=906612&view=diff
>>
>> ==============================================================================
>> --- httpd/httpd/trunk/os/win32/BaseAddr.ref (original)
>> +++ httpd/httpd/trunk/os/win32/BaseAddr.ref Thu Feb 4 19:32:24 2010
>> @@ -107,3 +107,4 @@
>> mod_heartmonitor.so 0x6F7E0000 0x00010000
>> mod_watchdog.so 0x6F7D0000 0x00010000
>> mod_proxy_scgi.so 0x6F7C0000 0x00010000
>> +mod_serf.so 0x6F7C0000 0x00010000
Re: svn commit: r906612 - in /httpd/httpd/trunk: Makefile.win os/win32/BaseAddr.ref
Posted by "Gregg L. Smith" <li...@glewis.com>.
Shouldn't this be a "B"?
What's one more compiler warning among friends :-)
while your burning cycles on svn someday ... mind adding all the new
kewl modules into httpd.conf?
I cannot seem to get libserf to build ... but I'll worry about that
later down the road.
Gregg
wrowe@apache.org wrote:
> URL: http://svn.apache.org/viewvc?rev=906612&view=rev
> Modified: httpd/httpd/trunk/os/win32/BaseAddr.ref
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/BaseAddr.ref?rev=906612&r1=906611&r2=906612&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/os/win32/BaseAddr.ref (original)
> +++ httpd/httpd/trunk/os/win32/BaseAddr.ref Thu Feb 4 19:32:24 2010
> @@ -107,3 +107,4 @@
> mod_heartmonitor.so 0x6F7E0000 0x00010000
> mod_watchdog.so 0x6F7D0000 0x00010000
> mod_proxy_scgi.so 0x6F7C0000 0x00010000
> +mod_serf.so 0x6F7C0000 0x00010000