VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-10 02:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finish libserf magic

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@906612 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2010-02-04 19:32:24 +00:00
parent 4c8baf8db2
commit a63cdab32f
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.win
View File

@ -142,6 +142,8 @@ _tryserf:
_tryserf: _tryserf:
@echo ----- @echo -----
@echo mod_serf will not build unless libserf.dll is built in srclib\serf @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 !ENDIF
# NOT EXIST("srclib\serf") # NOT EXIST("srclib\serf")
@ -600,10 +602,12 @@ _build:
_copybin: _copybin:
copy $(LONG)\httpd.$(src_exe) "$(inst_exe)" <.y copy $(LONG)\httpd.$(src_exe) "$(inst_exe)" <.y
copy $(LONG)\libhttpd.$(src_dll) "$(inst_dll)" <.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-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\$(LONG)\libaprutil-1.$(src_dll) "$(inst_dll)" <.y
copy srclib\apr-util\ldap\$(LONG)\apr_ldap-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 ( \ for %d in (odbc $(DBD_LIST)) do ( \
copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y \ copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y \
) )
@ -714,6 +718,9 @@ _copybin:
copy modules\proxy\$(LONG)\mod_proxy_ftp.$(src_so) "$(inst_so)" <.y 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_http.$(src_so) "$(inst_so)" <.y
copy modules\proxy\$(LONG)\mod_proxy_scgi.$(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_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_byrequests.$(src_so) "$(inst_so)" <.y
copy modules\proxy\balancers\$(LONG)\mod_lbmethod_bytraffic.$(src_so) "$(inst_so)" <.y copy modules\proxy\balancers\$(LONG)\mod_lbmethod_bytraffic.$(src_so) "$(inst_so)" <.y
@ -952,6 +959,9 @@ BEGIN {
srclib\apr-util\xml\expat\lib\expat.h \ srclib\apr-util\xml\expat\lib\expat.h \
srclib\apr\include\*.h \ srclib\apr\include\*.h \
srclib\apr-util\include\*.h \ srclib\apr-util\include\*.h \
!IF EXIST("srclib\serf")
srclib\serf\*.h \
!ENDIF
include\*.h \ include\*.h \
os\win32\os.h \ os\win32\os.h \
modules\cache\mod_cache.h \ modules\cache\mod_cache.h \
@ -981,6 +991,10 @@ BEGIN {
copy srclib\apr-iconv\$(LONG)\libapriconv-1.exp "$(INSTDIR)\lib" <.y 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.lib "$(INSTDIR)\lib" <.y
copy srclib\apr-util\$(LONG)\libaprutil-1.exp "$(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.exp "$(INSTDIR)\lib" <.y
copy $(LONG)\libhttpd.lib "$(INSTDIR)\lib" <.y copy $(LONG)\libhttpd.lib "$(INSTDIR)\lib" <.y
copy modules\dav\main\$(LONG)\mod_dav.exp "$(INSTDIR)\lib" <.y copy modules\dav\main\$(LONG)\mod_dav.exp "$(INSTDIR)\lib" <.y

1
os/win32/BaseAddr.ref
View File

@ -107,3 +107,4 @@ mod_heartbeat.so 0x6F7F0000 0x00010000
mod_heartmonitor.so 0x6F7E0000 0x00010000 mod_heartmonitor.so 0x6F7E0000 0x00010000
mod_watchdog.so 0x6F7D0000 0x00010000 mod_watchdog.so 0x6F7D0000 0x00010000
mod_proxy_scgi.so 0x6F7C0000 0x00010000 mod_proxy_scgi.so 0x6F7C0000 0x00010000
mod_serf.so 0x6F7C0000 0x00010000