Commit 9550ca92 authored by Gregg Lewis Smith's avatar Gregg Lewis Smith
Browse files

Add mod_brotli to Windows legacy build 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1792753 13f79535-47bb-0310-9956-ffa450edef68
parent 7d915acc

Apache-apr2.dsw

+18 −0
Original line number Diff line number Diff line
@@ -1228,6 +1228,24 @@ Package=<4> 


###############################################################################



Project: "mod_brotli"=.\modules\filters\mod_brotli.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_bucketeer"=.\modules\debugging\mod_bucketeer.dsp - Package Owner=<4>



Package=<5>

Apache.dsw

+21 −0
Original line number Diff line number Diff line
@@ -1465,6 +1465,27 @@ Package=<4> 


###############################################################################



Project: "mod_brotli"=.\modules\filters\mod_brotli.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_bucketeer"=.\modules\debugging\mod_bucketeer.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 _dummy"

# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _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 _dummy"

# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _dummy"

# PROP Rebuild_Opt ""

# PROP Target_File "\Apache2\bin\httpd.exe"

# PROP Bsc_Name ".\Browse\httpd.bsc"

Makefile.win

+52 −0
Original line number Diff line number Diff line
@@ -268,6 +268,33 @@ _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



_trydb:

!IF $(USEMAK) == 1

	cd srclib\$(UTILDIR)\dbd
@@ -504,6 +531,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)
@@ -777,6 +807,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
@@ -1101,6 +1134,25 @@ BEGIN { 
    exit 0;

}

<<

!ENDIF

!IF EXIST("srclib\brotli")

	type << >> "$(INSTDIR)\NOTICE.txt"



This binary distribution of mod_brotli.so includes Brotli C library written 

by the Brotli Authors. For complete information, visit Brotli's web site 

at https://github.com/google/brotli

<<

	-awk -f <<script.awk < "srclib\broyli\LICENSE" >> "$(INSTDIR)\LICENSE.txt"

BEGIN {

    print "";

    print "For the mod_brotli component:";

    print "";

	    while ( getline > 0 ) {

	print $$0;

    }

    exit 0;

}

<<

!ENDIF

	$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=$(SHORT) LONG=$(LONG) \

		_copybin src_exe=exe src_dll=dll src_so=so             \

build/installwinconf.awk

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ BEGIN { 
          print "#LoadModule authz_owner_module modules/mod_authz_owner.so" > dstfl;

          print "LoadModule authz_user_module modules/mod_authz_user.so" > dstfl;

          print "LoadModule autoindex_module modules/mod_autoindex.so" > dstfl;

          print "#LoadModule brotli_module modules/mod_brotli.so" > dstfl;

          print "#LoadModule buffer_module modules/mod_buffer.so" > dstfl;

          print "#LoadModule cache_module modules/mod_cache.so" > dstfl;

          print "#LoadModule cache_disk_module modules/mod_cache_disk.so" > dstfl;