From cvs-return-62814-archive-asf-public=cust-asf.ponee.io@httpd.apache.org Mon Feb 26 19:52:33 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id E559018064A for ; Mon, 26 Feb 2018 19:52:32 +0100 (CET) Received: (qmail 67156 invoked by uid 500); 26 Feb 2018 18:52:31 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 67147 invoked by uid 99); 26 Feb 2018 18:52:31 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Feb 2018 18:52:31 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 0CD4C3A005B for ; Mon, 26 Feb 2018 18:52:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1825400 - in /httpd/httpd/trunk: Apache-apr2.dsw Apache.dsw Makefile.win Date: Mon, 26 Feb 2018 18:52:31 -0000 To: cvs@httpd.apache.org From: gsmith@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180226185231.0CD4C3A005B@svn01-us-west.apache.org> Author: gsmith Date: Mon Feb 26 18:52:30 2018 New Revision: 1825400 URL: http://svn.apache.org/viewvc?rev=1825400&view=rev Log: complete the mod_proxy_uwsgi build Modified: httpd/httpd/trunk/Apache-apr2.dsw httpd/httpd/trunk/Apache.dsw httpd/httpd/trunk/Makefile.win Modified: httpd/httpd/trunk/Apache-apr2.dsw URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache-apr2.dsw?rev=1825400&r1=1825399&r2=1825400&view=diff ============================================================================== --- httpd/httpd/trunk/Apache-apr2.dsw (original) +++ httpd/httpd/trunk/Apache-apr2.dsw Mon Feb 26 18:52:30 2018 @@ -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> Modified: httpd/httpd/trunk/Apache.dsw URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache.dsw?rev=1825400&r1=1825399&r2=1825400&view=diff ============================================================================== --- httpd/httpd/trunk/Apache.dsw (original) +++ httpd/httpd/trunk/Apache.dsw Mon Feb 26 18:52:30 2018 @@ -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 @@ -2987,6 +2990,30 @@ Project: "mod_proxy_scgi"=.\modules\prox 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_uwsgi"=.\modules\proxy\mod_proxy_uwsgi.dsp - Package Owner=<4> + +Package=<5> +{{{ }}} Package=<4> Modified: httpd/httpd/trunk/Makefile.win URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=1825400&r1=1825399&r2=1825400&view=diff ============================================================================== --- httpd/httpd/trunk/Makefile.win (original) +++ httpd/httpd/trunk/Makefile.win Mon Feb 26 18:52:30 2018 @@ -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