diff options
author | Gregg Lewis Smith <gsmith@apache.org> | 2018-02-26 18:52:30 +0000 |
---|---|---|
committer | Gregg Lewis Smith <gsmith@apache.org> | 2018-02-26 18:52:30 +0000 |
commit | 9f834a4655fd8cb243b7b2cdbb8fc0302aa6bea1 (patch) | |
tree | ebf8126aa1da5a8591b4164a92b5a02f522bb899 | |
parent | 2d80cdeb7b319cc6ed4772617addc273c1c8913a (diff) | |
download | httpd-9f834a4655fd8cb243b7b2cdbb8fc0302aa6bea1.tar.gz |
complete the mod_proxy_uwsgi build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1825400 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | Apache-apr2.dsw | 21 | ||||
-rw-r--r-- | Apache.dsw | 27 | ||||
-rw-r--r-- | Makefile.win | 8 |
3 files changed, 56 insertions, 0 deletions
diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw index 7e90475690..fad53947c9 100644 --- a/Apache-apr2.dsw +++ b/Apache-apr2.dsw @@ -2546,6 +2546,27 @@ Package=<4> ############################################################################### +Project: "mod_proxy_uwsgi"=.\modules\proxy\mod_proxy_uwsgi.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libapr + 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_proxy_wstunnel"=.\modules\proxy\mod_proxy_wstunnel.dsp - Package Owner=<4> Package=<5> diff --git a/Apache.dsw b/Apache.dsw index 8e580a7780..1db45d6379 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -315,6 +315,9 @@ Package=<4> Project_Dep_Name mod_proxy_scgi End Project Dependency Begin Project Dependency + Project_Dep_Name mod_proxy_uwsgi + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_proxy_wstunnel End Project Dependency Begin Project Dependency @@ -3007,6 +3010,30 @@ Package=<4> ############################################################################### +Project: "mod_proxy_uwsgi"=.\modules\proxy\mod_proxy_uwsgi.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_proxy_wstunnel"=.\modules\proxy\mod_proxy_wstunnel.dsp - Package Owner=<4> Package=<5> diff --git a/Makefile.win b/Makefile.win index 32c92a00f6..a8155d4af6 100644 --- a/Makefile.win +++ b/Makefile.win @@ -481,6 +481,7 @@ _build: $(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. $(MAKE) $(MAKEOPT) -f libhttpd.mak CFG="libhttpd - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f libapreq.mak CFG="libapreq - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f httpd.mak CFG="httpd - Win32 $(LONG)" RECURSE=0 $(CTARGET) # build ldap prior to authnz_ldap cd modules\ldap @@ -512,6 +513,9 @@ _build: $(MAKE) $(MAKEOPT) -f mod_authz_owner.mak CFG="mod_authz_owner - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_authz_user.mak CFG="mod_authz_user - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. + cd modules\apreq + $(MAKE) $(MAKEOPT) -f mod_apreq.mak CFG="mod_apreq - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. cd modules\arch\win32 $(MAKE) $(MAKEOPT) -f mod_isapi.mak CFG="mod_isapi - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\..\.. @@ -648,6 +652,7 @@ _build: $(MAKE) $(MAKEOPT) -f mod_proxy_hcheck.mak CFG="mod_proxy_hcheck - 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) + $(MAKE) $(MAKEOPT) -f mod_proxy_uwsgi.mak CFG="mod_proxy_uwsgi - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_proxy_wstunnel.mak CFG="mod_proxy_wstunnel - Win32 $(LONG)" RECURSE=0 $(CTARGET) !IF EXIST("srclib\serf") $(MAKE) $(MAKEOPT) -f mod_serf.mak CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -792,6 +797,7 @@ _build: _copybin: copy $(LONG)\httpd.$(src_exe) "$(inst_exe)" <.y + copy $(LONG)\libapreq.$(src_dll) "$(inst_dll)" <.y copy $(LONG)\libhttpd.$(src_dll) "$(inst_dll)" <.y copy srclib\apr\$(LONG)\libapr-1.$(src_dll) "$(inst_dll)" <.y !IF EXIST("srclib\apr-util") @@ -835,6 +841,7 @@ _copybin: copy modules\aaa\$(LONG)\mod_authz_host.$(src_so) "$(inst_so)" <.y copy modules\aaa\$(LONG)\mod_authz_owner.$(src_so) "$(inst_so)" <.y copy modules\aaa\$(LONG)\mod_authz_user.$(src_so) "$(inst_so)" <.y + copy modules\apreq\$(LONG)\mod_apreq.$(src_so) "$(inst_so)" <.y copy modules\arch\win32\$(LONG)\mod_isapi.$(src_so) "$(inst_so)" <.y copy modules\cache\$(LONG)\mod_cache.$(src_so) "$(inst_so)" <.y copy modules\cache\$(LONG)\mod_cache_disk.$(src_so) "$(inst_so)" <.y @@ -948,6 +955,7 @@ _copybin: copy modules\proxy\$(LONG)\mod_proxy_hcheck.$(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_uwsgi.$(src_so) "$(inst_so)" <.y copy modules\proxy\$(LONG)\mod_proxy_wstunnel.$(src_so) "$(inst_so)" <.y !IF EXIST("srclib\serf") copy modules\proxy\$(LONG)\mod_serf.$(src_so) "$(inst_so)" <.y |