X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=Makefile.win;h=ace210287c31a3d47d605b5285a77030e4fb3e83;hb=fece93508b4c2aa38ff4047b592067be706f8ca3;hp=5f6a791a0b529675bf67dca70f489022a03ae4b7;hpb=719890b9bdc09141834ea66a00c7ac3cdc3665e7;p=apache diff --git a/Makefile.win b/Makefile.win index 5f6a791a0b..ace210287c 100644 --- a/Makefile.win +++ b/Makefile.win @@ -251,12 +251,16 @@ _trynghttp2: !IF $(USEMAK) == 1 cd modules\http2 $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_proxy_http2.mak CFG="mod_proxy_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. !ELSEIF $(USESLN) == 1 devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_http2 + devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_proxy_http2 !ELSE @msdev $(TLP).dsw /USEENV /MAKE \ "mod_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET) + @msdev $(TLP).dsw /USEENV /MAKE \ + "mod_proxy_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET) !ENDIF !ELSE @@ -270,6 +274,57 @@ _trynghttp2: !ENDIF +!IF EXIST("srclib\brotli") + +_trybrotli: +!IF $(USEMAK) == 1 + cd modules\filters + $(MAKE) $(MAKEOPT) -f mod_brotli.mak CFG="mod_brotli - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. +!ELSEIF $(USESLN) == 1 + devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_brotli +!ELSE + @msdev $(TLP).dsw /USEENV /MAKE \ + "mod_brotli - Win32 $(LONG)" /NORECURSE $(CTARGET) +!ENDIF + +!ELSE +# NOT EXIST("srclib\brotli") + +_trybrotli: + @echo ----- + @echo mod_brotli will not build unless brotli is built in srclib\brotli. + @echo Version 1.0.0 and later available from https://github.com/google/brotli/releases + @echo build with: + @echo cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF + @echo nmake + +!ENDIF + +!IF EXIST("srclib\openssl") && EXIST("srclib\jansson") && EXIST("srclib\curl") + +_trymd: +!IF $(USEMAK) == 1 + cd modules\md + $(MAKE) $(MAKEOPT) $(SSLOPT) -f mod_md.mak CFG="mod_md - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. +!ELSEIF $(USESLN) == 1 + devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_md +!ELSE + @msdev $(TLP).dsw /USEENV /MAKE \ + "mod_md - Win32 $(LONG)" /NORECURSE $(CTARGET) +!ENDIF + +!ELSE +# NOT EXIST("srclib\openssl") && EXIST("srclib\jansson") && EXIST("srclib\curl") + +_trymd: + @echo ----- + @echo mod_md not build unless OpenSSL, Jansson and Curl are built in placed + @echo in srclib. Example: srclib/openssl, srclib/jansson and srclib/curl + +!ENDIF + _trydb: !IF $(USEMAK) == 1 cd srclib\$(UTILDIR)\dbd @@ -426,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 @@ -457,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 ..\..\.. @@ -469,6 +528,7 @@ _build: # $(MAKE) $(MAKEOPT) -f mod_socache_dc.mak CFG="mod_socache_dc - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_socache_memcache.mak CFG="mod_socache_memcache - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_socache_shmcb.mak CFG="mod_socache_shmcb - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_socache_redis.mak CFG="mod_socache_redis - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd modules\core $(MAKE) $(MAKEOPT) -f mod_macro.mak CFG="mod_macro - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -507,6 +567,9 @@ _build: cd ..\.. !ENDIF cd modules\filters +!IF EXIST("srclib\brotli") + $(MAKE) $(MAKEOPT) -f mod_brotli.mak CFG="mod_brotli - Win32 $(LONG)" RECURSE=0 $(CTARGET) +!ENDIF $(MAKE) $(MAKEOPT) -f mod_buffer.mak CFG="mod_buffer - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_data.mak CFG="mod_data - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -537,11 +600,6 @@ _build: cd modules\http $(MAKE) $(MAKEOPT) -f mod_mime.mak CFG="mod_mime - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. -!IF EXIST("srclib\nghttp2") - cd modules\http2 - $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) - cd ..\.. -!ENDIF cd modules\loggers $(MAKE) $(MAKEOPT) -f mod_log_config.mak CFG="mod_log_config - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_log_debug.mak CFG="mod_log_debug - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -585,13 +643,22 @@ _build: $(MAKE) $(MAKEOPT) -f mod_proxy_express.mak CFG="mod_proxy_express - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_proxy_fcgi.mak CFG="mod_proxy_fcgi - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_proxy_ftp.mak CFG="mod_proxy_ftp - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(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) !ENDIF cd ..\.. +# mod_proxy before mod_proxy_http2 +!IF EXIST("srclib\nghttp2") + cd modules\http2 + $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_proxy_http2.mak CFG="mod_proxy_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. +!ENDIF cd modules\proxy\balancers $(MAKE) $(MAKEOPT) -f mod_lbmethod_bybusyness.mak CFG="mod_lbmethod_bybusyness - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_lbmethod_byrequests.mak CFG="mod_lbmethod_byrequests - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -622,6 +689,11 @@ _build: cd support $(MAKE) $(MAKEOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. +!IF EXIST("srclib\jansson") && EXIST("srclib\curl") + cd modules\md + $(MAKE) $(MAKEOPT) $(SSLOPT) -f mod_md.mak CFG="mod_md - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. +!ENDIF !ENDIF cd support $(MAKE) $(MAKEOPT) -f ab.mak CFG="ab - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -726,6 +798,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") @@ -769,6 +842,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 @@ -778,6 +852,7 @@ _copybin: # copy modules\cache\$(LONG)\mod_socache_dc.$(src_so) "$(inst_so)" <.y copy modules\cache\$(LONG)\mod_socache_memcache.$(src_so) "$(inst_so)" <.y copy modules\cache\$(LONG)\mod_socache_shmcb.$(src_so) "$(inst_so)" <.y + copy modules\cache\$(LONG)\mod_socache_redis.$(src_so) "$(inst_so)" <.y copy modules\core\$(LONG)\mod_macro.$(src_so) "$(inst_so)" <.y copy modules\core\$(LONG)\mod_watchdog.$(src_so) "$(inst_so)" <.y copy modules\cluster\$(LONG)\mod_heartbeat.$(src_so) "$(inst_so)" <.y @@ -796,6 +871,9 @@ _copybin: copy modules\examples\$(LONG)\mod_case_filter_in.$(src_so) "$(inst_so)" <.y copy modules\examples\$(LONG)\mod_example_hooks.$(src_so) "$(inst_so)" <.y copy modules\examples\$(LONG)\mod_example_ipc.$(src_so) "$(inst_so)" <.y +!ENDIF +!IF EXIST("srclib\brotli") + copy modules\filters\$(LONG)\mod_brotli.$(src_so) "$(inst_so)" <.y !ENDIF copy modules\filters\$(LONG)\mod_buffer.$(src_so) "$(inst_so)" <.y copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y @@ -830,6 +908,7 @@ _copybin: copy modules\http\$(LONG)\mod_mime.$(src_so) "$(inst_so)" <.y !IF EXIST("srclib\nghttp2") copy modules\http2\$(LONG)\mod_http2.$(src_so) "$(inst_so)" <.y + copy modules\http2\$(LONG)\mod_proxy_http2.$(src_so) "$(inst_so)" <.y !IF "$(SHORT)" == "D" copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll) "$(inst_dll)" <.y !ELSE @@ -874,8 +953,10 @@ _copybin: copy modules\proxy\$(LONG)\mod_proxy_express.$(src_so) "$(inst_so)" <.y copy modules\proxy\$(LONG)\mod_proxy_fcgi.$(src_so) "$(inst_so)" <.y copy modules\proxy\$(LONG)\mod_proxy_ftp.$(src_so) "$(inst_so)" <.y + 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 @@ -893,6 +974,11 @@ _copybin: copy modules\slotmem\$(LONG)\mod_slotmem_plain.$(src_so) "$(inst_so)" <.y copy modules\slotmem\$(LONG)\mod_slotmem_shm.$(src_so) "$(inst_so)" <.y !IF EXIST("srclib\openssl") +!IF EXIST("srclib\jansson") && EXIST("srclib\curl") + copy modules\md\$(LONG)\mod_md.$(src_so) "$(inst_so)" <.y + -copy srclib\jansson\bin\jansson.$(src_dll) "$(inst_dll)" <.y + -copy srclib\curl\bin\libcurl.$(src_dll) "$(inst_dll)" <.y +!ENDIF # copy modules\session\$(LONG)\mod_session_crypto.$(src_so) "$(inst_so)" <.y copy modules\ssl\$(LONG)\mod_ssl.$(src_so) "$(inst_so)" <.y -copy srclib\openssl\$(SSLBIN)\libeay32.$(src_dll) "$(inst_dll)" <.y @@ -941,150 +1027,6 @@ _install: -mkdir "$(INSTDIR)\lib" -mkdir "$(INSTDIR)\logs" -mkdir "$(INSTDIR)\modules" - copy ABOUT_APACHE "$(INSTDIR)\ABOUT_APACHE.txt" <.y - copy CHANGES "$(INSTDIR)\CHANGES.txt" <.y - copy INSTALL "$(INSTDIR)\INSTALL.txt" <.y - copy LICENSE "$(INSTDIR)\LICENSE.txt" <.y - copy NOTICE "$(INSTDIR)\NOTICE.txt" <.y - copy README "$(INSTDIR)\README.txt" <.y - type << >> "$(INSTDIR)\NOTICE.txt" - -Regular expression support is provided by the PCRE library package, -which is open source software, written by Philip Hazel, and copyright -by the University of Cambridge, England. The original software is -available from - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ -<< - -awk -f <> "$(INSTDIR)\LICENSE.txt" -BEGIN { - print ""; - print "For the pcre.dll component:"; - print ""; - while ( getline > 0 ) { - if ( $$0 ~ /^End$$/ ) $$0 = "END OF PCRE LICENSE"; - print $$0; - } -} -<< -!IF EXIST("srclib\openssl") - -copy srclib\openssl\apps\openssl.cnf "$(INSTDIR)\conf\openssl.cnf" <.y - type << >> "$(INSTDIR)\NOTICE.txt" - -This binary distribution includes cryptographic software written by -Eric Young (eay@cryptsoft.com), software written by Tim Hudson -(tjh@cryptsoft.com), and software developed by the OpenSSL Project -for use in the OpenSSL Toolkit . -<< - -awk -f <> "$(INSTDIR)\LICENSE.txt" -BEGIN { - print ""; - print "For the libeay32.dll, ssleay32.dll and openssl.exe components:"; - print ""; - while ( getline > 0 ) { - print $$0; - } -} -<< - copy << "$(INSTDIR)\OPENSSL-NEWS.txt" <.y - - Apache HTTP Server 2.5 Limited OpenSSL Distribution - - This binary distribution includes the minimal components of OpenSSL required - to support mod_ssl for Apache HTTP Server version 2.5 (details are listed - in OPENSSL-README.txt.) For the complete list of CHANGES to this and later - versions of OpenSSL, please refer to the definative source, - , or see the CHANGES file in the - full binary or source distribution package from . - - These OpenSSL binaries were built for distribution from the U.S. without - support for the patented encryption methods IDEA, MDC-2 or RC5. - --------------------------------------------------------------------------------- - -<< - -copy "$(INSTDIR)\OPENSSL-NEWS.txt" \ - + srclib\openssl\NEWS "$(INSTDIR)\OPENSSL-NEWS.txt" - copy << "$(INSTDIR)\OPENSSL-README.txt" <.y - - Apache HTTP Server 2.5 Limited OpenSSL Distribution - - This binary installation of OpenSSL is a limited distribution of the - files derived from the OpenSSL project: - - LICENSE.txt (includes openssl LICENSE) - OPENSSL-NEWS.txt - OPENSSL-README.txt - conf\openssl.cnf - bin\libeay32.dll - bin\ssleay32.dll - bin\openssl.exe - - These are the minimal libraries and tools required to use mod_ssl as - distributed with Apache HTTP Server version 2.5. No library link files, - headers or sources are distributed with this binary distribution. Please - refer to the site for complete source or binary - distributions. - - These OpenSSL binaries were built for distribution from the U.S. without - support for the patented encryption methods IDEA, MDC-2 or RC5. - - The Apache HTTP Project only supports the binary distribution of these files - and development of the mod_ssl module. We cannot provide support assistance - for using or configuring the OpenSSL package or these modules. Please refer - all installation and configuration questions to the appropriate forum, - such as the user supported lists, - the Apache HTTP Server user's list or the - OpenSSL support page. - --------------------------------------------------------------------------------- - -<< - -copy "$(INSTDIR)\OPENSSL-README.txt" \ - + srclib\openssl\README "$(INSTDIR)\OPENSSL-README.txt" -!ENDIF -!IF EXIST("srclib\zlib") - type << >> "$(INSTDIR)\NOTICE.txt" - -This binary distribution of mod_deflate.so includes zlib compression code - written by Jean-loup Gailly (jloup@gzip.org) -and Mark Adler (madler@alumni.caltech.edu) . -<< - -awk -f <> "$(INSTDIR)\LICENSE.txt" -BEGIN { - while ( getline > 0 ) { - if ( $$0 ~ /Copyright notice:/ ) { - print ""; - print "For the mod_deflate zlib compression component:"; - while ( getline > 0 && $$0 !~ /^[^ ]/ ) { - print $$0; - } - exit 0; - } - } - exit 1; -} -<< -!ENDIF -!IF EXIST("srclib\lua") - type << >> "$(INSTDIR)\NOTICE.txt" - -This binary distribution of mod_lua.so includes the Lua language, -developed at Lua.org, a laboratory of the Department of Computer Science -of PUC-Rio (the Pontifical Catholic University of Rio de Janeiro in Brazil). -For complete information, visit Lua's web site at http://www.lua.org/ -<< - -awk -f <> "$(INSTDIR)\LICENSE.txt" -BEGIN { - print ""; - print "For the mod_lua language component:"; - print ""; - while ( getline > 0 && $$0 !~ /end of COPYRIGHT/ ) { - print $$0; - } - exit 0; -} -<< -!ENDIF $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=$(SHORT) LONG=$(LONG) \ _copybin src_exe=exe src_dll=dll src_so=so \ inst_exe="$(INSTDIR)\bin" \ @@ -1128,6 +1070,7 @@ BEGIN { modules\filters\mod_include.h \ modules\generators\mod_cgi.h \ modules\generators\mod_status.h \ + modules\http2\mod_http2.h \ modules\loggers\mod_log_config.h \ modules\mappers\mod_rewrite.h \ modules\proxy\mod_proxy.h \