From bea2912efdfe9fba8b9509649eb9d2e53d7807b9 Mon Sep 17 00:00:00 2001 From: Gregg Lewis Smith Date: Thu, 30 Nov 2017 19:43:53 +0000 Subject: [PATCH] Win32 Legacy build git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mod_md@1816751 13f79535-47bb-0310-9956-ffa450edef68 --- Apache-apr2.dsw | 18 ++ Apache.dsw | 21 ++ BuildBin.dsp | 4 +- Makefile.win | 39 +++ build/installwinconf.awk | 1 + modules/md/mod_md.dep | 5 + modules/md/mod_md.dsp | 2 +- modules/md/mod_md.mak | 520 +++++++++++++++++++++++++++++++++++++++ modules/ssl/mod_ssl.dsp | 4 +- modules/ssl/mod_ssl.mak | 4 +- os/win32/BaseAddr.ref | 1 + 11 files changed, 612 insertions(+), 7 deletions(-) create mode 100644 modules/md/mod_md.dep create mode 100644 modules/md/mod_md.mak diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw index c3f75e6f26..191363158c 100644 --- a/Apache-apr2.dsw +++ b/Apache-apr2.dsw @@ -2086,6 +2086,24 @@ Package=<4> ############################################################################### +Project: "mod_md"=.\modules\md\mod_md.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 +}}} + +############################################################################### + Project: "mod_mime"=.\modules\http\mod_mime.dsp - Package Owner=<4> Package=<5> diff --git a/Apache.dsw b/Apache.dsw index 30866bc0d5..2a08ecdf45 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -2485,6 +2485,27 @@ Package=<4> ############################################################################### +Project: "mod_md"=.\modules\md\mod_md.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 +}}} + +############################################################################### + Project: "mod_mime"=.\modules\http\mod_mime.dsp - Package Owner=<4> Package=<5> diff --git a/BuildBin.dsp b/BuildBin.dsp index 173cffb97f..1559664540 100644 --- a/BuildBin.dsp +++ b/BuildBin.dsp @@ -39,7 +39,7 @@ CFG=BuildBin - Win32 Debug # PROP Use_Debug_Libraries 0 # PROP Output_Dir "" # PROP Intermediate_Dir "" -# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _dummy" +# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _trymd _dummy" # PROP Rebuild_Opt "" # PROP Target_File "\Apache2\bin\httpd.exe" # PROP Bsc_Name ".\Browse\httpd.bsc" @@ -58,7 +58,7 @@ CFG=BuildBin - Win32 Debug # PROP Use_Debug_Libraries 1 # PROP Output_Dir "" # PROP Intermediate_Dir "" -# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _dummy" +# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _trymd _dummy" # PROP Rebuild_Opt "" # PROP Target_File "\Apache2\bin\httpd.exe" # PROP Bsc_Name ".\Browse\httpd.bsc" diff --git a/Makefile.win b/Makefile.win index 3444cca428..705b643c22 100644 --- a/Makefile.win +++ b/Makefile.win @@ -295,6 +295,30 @@ _trybrotli: !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 will not build unless OpenSSL, Jansson and Curl are built and placed + @echo in srclib. Example: srclib/openssl, srclib/jansson and srclib/curl + +!ENDIF + _trydb: !IF $(USEMAK) == 1 cd srclib\$(UTILDIR)\dbd @@ -586,6 +610,11 @@ _build: $(MAKE) $(MAKEOPT) -f mod_userdir.mak CFG="mod_userdir - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_vhost_alias.mak CFG="mod_vhost_alias - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. +!IF EXIST("srclib\openssl") && 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 cd modules\metadata $(MAKE) $(MAKEOPT) -f mod_cern_meta.mak CFG="mod_cern_meta - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_env.mak CFG="mod_env - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -871,6 +900,16 @@ _copybin: copy modules\mappers\$(LONG)\mod_speling.$(src_so) "$(inst_so)" <.y copy modules\mappers\$(LONG)\mod_userdir.$(src_so) "$(inst_so)" <.y copy modules\mappers\$(LONG)\mod_vhost_alias.$(src_so) "$(inst_so)" <.y +!IF EXIST("srclib\openssl") && EXIST("srclib\jansson") && EXIST("srclib\curl") + copy modules\md\$(LONG)\mod_md.$(src_so) "$(inst_so)" <.y +!IF "$(SHORT)" == "D" + -copy srclib\curl\bin\libcurl_debug.$(src_dll) "$(inst_dll)" <.y + -copy srclib\jansson\bin\jansson_d.$(src_dll) "$(inst_dll)" <.y +!ELSE + -copy srclib\curl\bin\libcurl.$(src_dll) "$(inst_dll)" <.y + -copy srclib\jansson\bin\jansson.$(src_dll) "$(inst_dll)" <.y +!ENDIF +!ENDIF copy modules\metadata\$(LONG)\mod_cern_meta.$(src_so) "$(inst_so)" <.y copy modules\metadata\$(LONG)\mod_env.$(src_so) "$(inst_so)" <.y copy modules\metadata\$(LONG)\mod_expires.$(src_so) "$(inst_so)" <.y diff --git a/build/installwinconf.awk b/build/installwinconf.awk index 05f519b480..ab64b2daa4 100644 --- a/build/installwinconf.awk +++ b/build/installwinconf.awk @@ -156,6 +156,7 @@ BEGIN { print "#LoadModule log_debug_module modules/mod_log_debug.so" > dstfl; print "#LoadModule log_forensic_module modules/mod_log_forensic.so" > dstfl; print "#LoadModule lua_module modules/mod_lua.so" > dstfl; + print "#LoadModule md_module modules/mod_md.so" > dstfl; print "#LoadModule macro_module modules/mod_macro.so" > dstfl; print "LoadModule mime_module modules/mod_mime.so" > dstfl; print "#LoadModule mime_magic_module modules/mod_mime_magic.so" > dstfl; diff --git a/modules/md/mod_md.dep b/modules/md/mod_md.dep new file mode 100644 index 0000000000..0cbd691fb2 --- /dev/null +++ b/modules/md/mod_md.dep @@ -0,0 +1,5 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_md.mak + +..\..\build\win32\httpd.rc : \ + "..\..\include\ap_release.h"\ + diff --git a/modules/md/mod_md.dsp b/modules/md/mod_md.dsp index edc7f859c8..c685f54043 100644 --- a/modules/md/mod_md.dsp +++ b/modules/md/mod_md.dsp @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_md.so" /base:@..\..\os\win32\BaseAddr.ref,mod_md.so -# ADD LINK32 kernel32.lib libhttpd.lib libapr-1.lib libaprutil-1.lib ssleay32.lib libeay32.lib jansson_d.lib libcurl.lib /nologo /subsystem:windows /dll /libpath:"../../srclib/openssl/out32dll" /libpath:"../../srclib/jansson/lib" /libpath:"../../srclib/curl/lib" /incremental:no /debug /out:".\Debug\mod_md.so" /base:@..\..\os\win32\BaseAddr.ref,mod_md.so +# ADD LINK32 kernel32.lib libhttpd.lib libapr-1.lib libaprutil-1.lib ssleay32.lib libeay32.lib jansson_d.lib libcurl_debug.lib /nologo /subsystem:windows /dll /libpath:"../../srclib/openssl/out32dll" /libpath:"../../srclib/jansson/lib" /libpath:"../../srclib/curl/lib" /incremental:no /debug /out:".\Debug\mod_md.so" /base:@..\..\os\win32\BaseAddr.ref,mod_md.so # Begin Special Build Tool TargetPath=.\Debug\mod_md.so SOURCE="$(InputPath)" diff --git a/modules/md/mod_md.mak b/modules/md/mod_md.mak new file mode 100644 index 0000000000..9d5881edcb --- /dev/null +++ b/modules/md/mod_md.mak @@ -0,0 +1,520 @@ +# Microsoft Developer Studio Generated NMAKE File, Based on mod_md.dsp +!IF "$(CFG)" == "" +CFG=mod_md - Win32 Release +!MESSAGE No configuration specified. Defaulting to mod_md - Win32 Release. +!ENDIF + +!IF "$(CFG)" != "mod_md - Win32 Release" && "$(CFG)" != "mod_md - Win32 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "mod_md.mak" CFG="mod_md - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "mod_md - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_md - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +!IF "$(OS)" == "Windows_NT" +NULL= +!ELSE +NULL=nul +!ENDIF + +!IF "$(_HAVE_OSSL110)" == "1" +SSLCRP=libcrypto +SSLLIB=libssl +SSLINC=/I ../../srclib/openssl/include +SSLBIN=/libpath:../../srclib/openssl +!ELSE +SSLCRP=libeay32 +SSLLIB=ssleay32 +SSLINC=/I ../../srclib/openssl/inc32 +SSLBIN=/libpath:../../srclib/openssl/out32dll +!ENDIF + +!IF "$(CFG)" == "mod_md - Win32 Release" + +OUTDIR=.\Release +INTDIR=.\Release +# Begin Custom Macros +OutDir=.\Release +# End Custom Macros + +!IF "$(RECURSE)" == "0" + +ALL : "$(OUTDIR)\mod_md.so" + +!ELSE + +ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\mod_md.so" + +!ENDIF + +!IF "$(RECURSE)" == "1" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" +!ELSE +CLEAN : +!ENDIF + -@erase "$(INTDIR)\md_acme.obj" + -@erase "$(INTDIR)\md_acme_acct.obj" + -@erase "$(INTDIR)\md_acme_authz.obj" + -@erase "$(INTDIR)\md_acme_drive.obj" + -@erase "$(INTDIR)\md_core.obj" + -@erase "$(INTDIR)\md_crypt.obj" + -@erase "$(INTDIR)\md_curl.obj" + -@erase "$(INTDIR)\md_http.obj" + -@erase "$(INTDIR)\md_json.obj" + -@erase "$(INTDIR)\md_jws.obj" + -@erase "$(INTDIR)\md_log.obj" + -@erase "$(INTDIR)\md_reg.obj" + -@erase "$(INTDIR)\md_store.obj" + -@erase "$(INTDIR)\md_store_fs.obj" + -@erase "$(INTDIR)\md_util.obj" + -@erase "$(INTDIR)\mod_md.obj" + -@erase "$(INTDIR)\mod_md.res" + -@erase "$(INTDIR)\mod_md_config.obj" + -@erase "$(INTDIR)\mod_md_os.obj" + -@erase "$(INTDIR)\mod_md_src.idb" + -@erase "$(INTDIR)\mod_md_src.pdb" + -@erase "$(OUTDIR)\mod_md.exp" + -@erase "$(OUTDIR)\mod_md.lib" + -@erase "$(OUTDIR)\mod_md.pdb" + -@erase "$(OUTDIR)\mod_md.so" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../../server/mpm/winnt" /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" $(SSLINC) /I "../../srclib/jansson/include" /I "../../srclib/curl/include" /I "../ssl" /I "../core" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ssize_t=long /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_md_src" /FD /I " ../ssl" /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +MTL=midl.exe +MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mod_md.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME=mod_md.so /d LONG_NAME=Letsencrypt module for Apache +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_md.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib libhttpd.lib libapr-1.lib libaprutil-1.lib $(SSLCRP).lib $(SSLLIB).lib jansson.lib libcurl.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_md.pdb" /debug /out:"$(OUTDIR)\mod_md.so" /implib:"$(OUTDIR)\mod_md.lib" /libpath:"../../srclib/apr/Release" /libpath:"../../srclib/apr-util/Release" /libpath:"../../Release/" $(SSLBIN) /libpath:"../../srclib/jansson/lib" /libpath:"../../srclib/curl/lib" /base:@..\..\os\win32\BaseAddr.ref,mod_md.so /opt:ref +LINK32_OBJS= \ + "$(INTDIR)\mod_md.obj" \ + "$(INTDIR)\mod_md_config.obj" \ + "$(INTDIR)\mod_md_os.obj" \ + "$(INTDIR)\md_core.obj" \ + "$(INTDIR)\md_crypt.obj" \ + "$(INTDIR)\md_curl.obj" \ + "$(INTDIR)\md_http.obj" \ + "$(INTDIR)\md_json.obj" \ + "$(INTDIR)\md_jws.obj" \ + "$(INTDIR)\md_log.obj" \ + "$(INTDIR)\md_reg.obj" \ + "$(INTDIR)\md_store.obj" \ + "$(INTDIR)\md_store_fs.obj" \ + "$(INTDIR)\md_util.obj" \ + "$(INTDIR)\md_acme.obj" \ + "$(INTDIR)\md_acme_acct.obj" \ + "$(INTDIR)\md_acme_authz.obj" \ + "$(INTDIR)\md_acme_drive.obj" \ + "$(INTDIR)\mod_md.res" \ + "..\..\srclib\apr\Release\libapr-1.lib" \ + "..\..\srclib\apr-util\Release\libaprutil-1.lib" \ + "..\..\Release\libhttpd.lib" + +"$(OUTDIR)\mod_md.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +TargetPath=.\Release\mod_md.so +SOURCE="$(InputPath)" +PostBuild_Desc=Embed .manifest +DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep + +ALL : $(DS_POSTBUILD_DEP) + +# Begin Custom Macros +OutDir=.\Release +# End Custom Macros + +$(DS_POSTBUILD_DEP) : "libhttpd - Win32 Release" "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\mod_md.so" + if exist .\Release\mod_md.so.manifest mt.exe -manifest .\Release\mod_md.so.manifest -outputresource:.\Release\mod_md.so;2 + echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" + +!ELSEIF "$(CFG)" == "mod_md - Win32 Debug" + +OUTDIR=.\Debug +INTDIR=.\Debug +# Begin Custom Macros +OutDir=.\Debug +# End Custom Macros + +!IF "$(RECURSE)" == "0" + +ALL : "$(OUTDIR)\mod_md.so" + +!ELSE + +ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_md.so" + +!ENDIF + +!IF "$(RECURSE)" == "1" +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" +!ELSE +CLEAN : +!ENDIF + -@erase "$(INTDIR)\md_acme.obj" + -@erase "$(INTDIR)\md_acme_acct.obj" + -@erase "$(INTDIR)\md_acme_authz.obj" + -@erase "$(INTDIR)\md_acme_drive.obj" + -@erase "$(INTDIR)\md_core.obj" + -@erase "$(INTDIR)\md_crypt.obj" + -@erase "$(INTDIR)\md_curl.obj" + -@erase "$(INTDIR)\md_http.obj" + -@erase "$(INTDIR)\md_json.obj" + -@erase "$(INTDIR)\md_jws.obj" + -@erase "$(INTDIR)\md_log.obj" + -@erase "$(INTDIR)\md_reg.obj" + -@erase "$(INTDIR)\md_store.obj" + -@erase "$(INTDIR)\md_store_fs.obj" + -@erase "$(INTDIR)\md_util.obj" + -@erase "$(INTDIR)\mod_md.obj" + -@erase "$(INTDIR)\mod_md.res" + -@erase "$(INTDIR)\mod_md_config.obj" + -@erase "$(INTDIR)\mod_md_os.obj" + -@erase "$(INTDIR)\mod_md_src.idb" + -@erase "$(INTDIR)\mod_md_src.pdb" + -@erase "$(OUTDIR)\mod_md.exp" + -@erase "$(OUTDIR)\mod_md.lib" + -@erase "$(OUTDIR)\mod_md.pdb" + -@erase "$(OUTDIR)\mod_md.so" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" $(SSLINC) /I "../../srclib/jansson/include" /I "../../srclib/curl/include" /I "../core" /I "../ssl" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ssize_t=long /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_md_src" /FD /EHsc /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mod_md.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME=mod_md.so /d LONG_NAME=http2_module for Apache +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_md.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib libhttpd.lib libapr-1.lib libaprutil-1.lib $(SSLCRP).lib $(SSLLIB).lib jansson_d.lib libcurl_debug.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_md.pdb" /debug /out:"$(OUTDIR)\mod_md.so" /implib:"$(OUTDIR)\mod_md.lib" $(SSLBIN) /libpath:"../../srclib/jansson/lib" /libpath:"../../srclib/curl/lib" /base:@..\..\os\win32\BaseAddr.ref,mod_md.so +LINK32_OBJS= \ + "$(INTDIR)\mod_md.obj" \ + "$(INTDIR)\mod_md_config.obj" \ + "$(INTDIR)\mod_md_os.obj" \ + "$(INTDIR)\md_core.obj" \ + "$(INTDIR)\md_crypt.obj" \ + "$(INTDIR)\md_curl.obj" \ + "$(INTDIR)\md_http.obj" \ + "$(INTDIR)\md_json.obj" \ + "$(INTDIR)\md_jws.obj" \ + "$(INTDIR)\md_log.obj" \ + "$(INTDIR)\md_reg.obj" \ + "$(INTDIR)\md_store.obj" \ + "$(INTDIR)\md_store_fs.obj" \ + "$(INTDIR)\md_util.obj" \ + "$(INTDIR)\md_acme.obj" \ + "$(INTDIR)\md_acme_acct.obj" \ + "$(INTDIR)\md_acme_authz.obj" \ + "$(INTDIR)\md_acme_drive.obj" \ + "$(INTDIR)\mod_md.res" \ + "..\..\srclib\apr\Debug\libapr-1.lib" \ + "..\..\srclib\apr-util\Debug\libaprutil-1.lib" \ + "..\..\Debug\libhttpd.lib" + +"$(OUTDIR)\mod_md.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +TargetPath=.\Debug\mod_md.so +SOURCE="$(InputPath)" +PostBuild_Desc=Embed .manifest +DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep + +ALL : $(DS_POSTBUILD_DEP) + +# Begin Custom Macros +OutDir=.\Debug +# End Custom Macros + +$(DS_POSTBUILD_DEP) : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_md.so" + if exist .\Debug\mod_md.so.manifest mt.exe -manifest .\Debug\mod_md.so.manifest -outputresource:.\Debug\mod_md.so;2 + echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" + +!ENDIF + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_md.dep") +!INCLUDE "mod_md.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_md.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_md - Win32 Release" || "$(CFG)" == "mod_md - Win32 Debug" + +!IF "$(CFG)" == "mod_md - Win32 Release" + +"libapr - Win32 Release" : + cd "..\..\srclib\apr" + $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" + cd "..\..\modules\md" + +"libapr - Win32 ReleaseCLEAN" : + cd "..\..\srclib\apr" + $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN + cd "..\..\modules\md" + +!ELSEIF "$(CFG)" == "mod_md - Win32 Debug" + +"libapr - Win32 Debug" : + cd "..\..\srclib\apr" + $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" + cd "..\..\modules\md" + +"libapr - Win32 DebugCLEAN" : + cd "..\..\srclib\apr" + $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN + cd "..\..\modules\md" + +!ENDIF + +!IF "$(CFG)" == "mod_md - Win32 Release" + +"libaprutil - Win32 Release" : + cd "..\..\srclib\apr-util" + $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" + cd "..\..\modules\md" + +"libaprutil - Win32 ReleaseCLEAN" : + cd "..\..\srclib\apr-util" + $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN + cd "..\..\modules\md" + +!ELSEIF "$(CFG)" == "mod_md - Win32 Debug" + +"libaprutil - Win32 Debug" : + cd "..\..\srclib\apr-util" + $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" + cd "..\..\modules\md" + +"libaprutil - Win32 DebugCLEAN" : + cd "..\..\srclib\apr-util" + $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN + cd "..\..\modules\md" + +!ENDIF + +!IF "$(CFG)" == "mod_md - Win32 Release" + +"libhttpd - Win32 Release" : + cd "..\.." + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" + cd ".\modules\md" + +"libhttpd - Win32 ReleaseCLEAN" : + cd "..\.." + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" RECURSE=1 CLEAN + cd ".\modules\md" + +!ELSEIF "$(CFG)" == "mod_md - Win32 Debug" + +"libhttpd - Win32 Debug" : + cd "..\.." + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" + cd ".\modules\md" + +"libhttpd - Win32 DebugCLEAN" : + cd "..\.." + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" RECURSE=1 CLEAN + cd ".\modules\md" + +!ENDIF + +SOURCE=..\..\build\win32\httpd.rc + +!IF "$(CFG)" == "mod_md - Win32 Release" + + +"$(INTDIR)\mod_md.res" : $(SOURCE) "$(INTDIR)" + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_md.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_md.so" /d LONG_NAME="md_module for Apache" $(SOURCE) + + +!ELSEIF "$(CFG)" == "mod_md - Win32 Debug" + + +"$(INTDIR)\mod_md.res" : $(SOURCE) "$(INTDIR)" + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_md.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_md.so" /d LONG_NAME="md_module for Apache" $(SOURCE) + + +!ENDIF + +SOURCE=./md_acme.c + +"$(INTDIR)\md_acme.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_acme_acct.c + +"$(INTDIR)\md_acme_acct.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_acme_authz.c + +"$(INTDIR)\md_acme_authz.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_acme_drive.c + +"$(INTDIR)\md_acme_drive.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_core.c + +"$(INTDIR)\md_core.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_crypt.c + +"$(INTDIR)\md_crypt.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_curl.c + +"$(INTDIR)\md_curl.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_http.c + +"$(INTDIR)\md_http.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_json.c + +"$(INTDIR)\md_json.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_jws.c + +"$(INTDIR)\md_jws.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_log.c + +"$(INTDIR)\md_log.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_reg.c + +"$(INTDIR)\md_reg.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_store.c + +"$(INTDIR)\md_store.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_store_fs.c + +"$(INTDIR)\md_store_fs.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./md_util.c + +"$(INTDIR)\md_util.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./mod_md.c + +"$(INTDIR)\mod_md.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./mod_md_config.c + +"$(INTDIR)\mod_md_config.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=./mod_md_os.c + +"$(INTDIR)\mod_md_os.obj" : $(SOURCE) "$(INTDIR)" + + + +!ENDIF + diff --git a/modules/ssl/mod_ssl.dsp b/modules/ssl/mod_ssl.dsp index 72af2936ce..65b554d58e 100644 --- a/modules/ssl/mod_ssl.dsp +++ b/modules/ssl/mod_ssl.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fd"Release\mod_ssl_src" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /I "../md" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fd"Release\mod_ssl_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -75,7 +75,7 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fd"Debug\mod_ssl_src" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /I "../md" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fd"Debug\mod_ssl_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" diff --git a/modules/ssl/mod_ssl.mak b/modules/ssl/mod_ssl.mak index 03476ab38c..ea771955ee 100644 --- a/modules/ssl/mod_ssl.mak +++ b/modules/ssl/mod_ssl.mak @@ -90,7 +90,7 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" $(SSLINC) /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /c +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../md" $(SSLINC) /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /c .c{$(INTDIR)}.obj:: $(CPP) @<< @@ -224,7 +224,7 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" $(SSLINC) /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /EHsc /c +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../md" $(SSLINC) /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /EHsc /c .c{$(INTDIR)}.obj:: $(CPP) @<< diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index db0144bfae..49bcfcd633 100644 --- a/os/win32/BaseAddr.ref +++ b/os/win32/BaseAddr.ref @@ -130,3 +130,4 @@ mod_proxy_hcheck.so 0x70C10000 0x00020000 mod_proxy_http2.so 0x70C30000 0x00020000 mod_http2.so 0x70C50000 0x00040000 mod_brotli.so 0x70C90000 0x000C0000 +mod_md.so 0x70D50000 0x00020000 -- 2.40.0