Commit 20b7d0f4 authored by Gregg Lewis Smith's avatar Gregg Lewis Smith
Browse files

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
parent eac305e7

Apache-apr2.dsw

+18 −0
Original line number Diff line number Diff line
@@ -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>

Apache.dsw

+21 −0
Original line number Diff line number Diff line
@@ -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>

BuildBin.dsp

+2 −2
Original line number Diff line number Diff line
@@ -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"

Makefile.win

+39 −0
Original line number Diff line number Diff line
@@ -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

build/installwinconf.awk

+1 −0
Original line number Diff line number Diff line
@@ -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;