Commit 2c12f3f8 authored by Gregg Lewis Smith's avatar Gregg Lewis Smith
Browse files

Added proxy_html and xml2enc to Windows build 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1196876 13f79535-47bb-0310-9956-ffa450edef68
parent 4cc42219

Apache-apr2.dsw

+45 −0
Changes for Apache-apr2.dsw: 45 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2213,6 +2213,27 @@ Package=<4> 


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



Project: "mod_proxy_html"=.\modules\filters\mod_proxy_html.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_proxy_http"=.\modules\proxy\mod_proxy_http.dsp - Package Owner=<4>



Package=<5>
@@ -2793,6 +2814,30 @@ Package=<4> 


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



Project: "mod_xml2enc"=.\modules\filters\mod_xml2enc.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

    Begin Project Dependency

    Project_Dep_Name mod_proxy_html

    End Project Dependency

}}}



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



Project: "rotatelogs"=.\support\rotatelogs.dsp - Package Owner=<4>



Package=<5>

Apache.dsw

+45 −0
Changes for Apache.dsw: 45 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2597,6 +2597,27 @@ Package=<4> 


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



Project: "mod_proxy_html"=.\modules\filters\mod_proxy_html.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_proxy_http"=.\modules\proxy\mod_proxy_http.dsp - Package Owner=<4>



Package=<5>
@@ -3269,6 +3290,30 @@ Package=<4> 


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



Project: "mod_xml2enc"=.\modules\filters\mod_xml2enc.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

    Begin Project Dependency

    Project_Dep_Name mod_proxy_html

    End Project Dependency

}}}



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



Project: "rotatelogs"=.\support\rotatelogs.dsp - Package Owner=<4>



Package=<5>

BuildBin.dsp

+2 −2
Changes for BuildBin.dsp: 2 added lines, 2 removed lines.
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 _tryssl _tryzlib _tryserf _dummy"

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

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

# PROP Rebuild_Opt ""

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

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

Makefile.win

+50 −0
Changes for Makefile.win: 50 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -187,6 +187,35 @@ _tryzlib: 


!ENDIF



!IF EXIST("srclib\libxml2")



_tryxml:

!IF $(USEMAK) == 1

	cd modules\filters

	$(MAKE) $(MAKEOPT) -f mod_proxy_html.mak CFG="mod_proxy_html - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	$(MAKE) $(MAKEOPT) -f mod_xml2enc.mak CFG="mod_xml2enc - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	cd ..\..

!ELSEIF $(USESLN) == 1

	devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_proxy_html

	devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_xml2enc

!ELSE

	@msdev $(TLP).dsw /USEENV /MAKE \

		"mod_proxy_html - Win32 $(LONG)" /NORECURSE $(CTARGET)

	@msdev $(TLP).dsw /USEENV /MAKE \

		"mod_xml2enc - Win32 $(LONG)" /NORECURSE $(CTARGET)

!ENDIF



!ELSE

#     NOT EXIST("srclib\libxml2")



_tryxml:

	@echo -----

	@echo mod_proxy_html and mod_xml2enc will not build unless libxml2 is 

	@echo built in srclib\libxml2. Version 2.7.7 and later available from

	@echo http://xmlsoft.org/ will satisfy this requirement.



!ENDIF





!IF EXIST("srclib\lua")
@@ -453,6 +482,10 @@ _build: 
	 $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak  CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f mod_filter.mak      CFG="mod_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f mod_include.mak     CFG="mod_include - Win32 $(LONG)" RECURSE=0 $(CTARGET)

!IF EXIST("srclib\libxml2")

	 $(MAKE) $(MAKEOPT) -f mod_proxy_html.mak     CFG="mod_proxy_html - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f mod_xml2enc.mak     CFG="mod_xml2enc - Win32 $(LONG)" RECURSE=0 $(CTARGET)

!ENDIF

	 $(MAKE) $(MAKEOPT) -f mod_ratelimit.mak   CFG="mod_ratelimit - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f mod_reflector.mak   CFG="mod_reflector - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f mod_reqtimeout.mak  CFG="mod_reqtimeout - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -591,6 +624,10 @@ _build: 
!IF EXIST("srclib\lua")

	devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_lua

!ENDIF

!IF EXIST("srclib\libxml2")

	devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_proxy_html

	devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_xml2enc

!ENDIF



!ELSE
@@ -630,6 +667,12 @@ _build: 
	@msdev $(TLP).dsw /USEENV /MAKE \

		"mod_lua - Win32 $(LONG)" /NORECURSE $(CTARGET)

!ENDIF

!IF EXIST("srclib\libxml2")

	@msdev $(TLP).dsw /USEENV /MAKE \

		"mod_proxy_html - Win32 $(LONG)" /NORECURSE $(CTARGET)

	@msdev $(TLP).dsw /USEENV /MAKE \

		"mod_xml2enc - Win32 $(LONG)" /NORECURSE $(CTARGET)

!ENDIF



!ENDIF
@@ -709,6 +752,13 @@ _copybin: 
	copy modules\filters\$(LONG)\mod_ext_filter.$(src_so) 	"$(inst_so)" <.y

	copy modules\filters\$(LONG)\mod_filter.$(src_so) 	"$(inst_so)" <.y

	copy modules\filters\$(LONG)\mod_include.$(src_so) 	"$(inst_so)" <.y

!IF EXIST("srclib\libxml2")

	copy modules\filters\$(LONG)\mod_proxy_html.$(src_so) 	"$(inst_so)" <.y

	copy modules\filters\$(LONG)\mod_xml2enc.$(src_so) 	"$(inst_so)" <.y

!IF EXIST("srclib\libxml2\win32\bin.msvc\libxml2.$(src_dll)")

	copy srclib\libxml2\win32\bin.msvc\libxml2.$(src_dll)		 	"$(inst_dll)" <.y

!ENDIF

!ENDIF

	copy modules\filters\$(LONG)\mod_ratelimit.$(src_so) 	"$(inst_so)" <.y

	copy modules\filters\$(LONG)\mod_reflector.$(src_so) 	"$(inst_so)" <.y

	copy modules\filters\$(LONG)\mod_reqtimeout.$(src_so) 	"$(inst_so)" <.y

modules/filters/mod_proxy_html.dsp

0 → 100644
+123 −0
Changes for modules/filters/mod_proxy_html.dsp: 123 added lines, 0 removed lines.
Original line number Diff line number Diff line 
# Microsoft Developer Studio Project File - Name="mod_proxy_html" - Package Owner=<4>

# Microsoft Developer Studio Generated Build File, Format Version 6.00

# ** DO NOT EDIT **



# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102



CFG=mod_proxy_html - Win32 Release

!MESSAGE This is not a valid makefile. To build this project using NMAKE,

!MESSAGE use the Export Makefile command and run

!MESSAGE 

!MESSAGE NMAKE /f "mod_proxy_html.mak".

!MESSAGE 

!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_proxy_html.mak" CFG="mod_proxy_html - Win32 Release"

!MESSAGE 

!MESSAGE Possible choices for configuration are:

!MESSAGE 

!MESSAGE "mod_proxy_html - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

!MESSAGE "mod_proxy_html - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

!MESSAGE 



# Begin Project

# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=cl.exe

MTL=midl.exe

RSC=rc.exe



!IF  "$(CFG)" == "mod_proxy_html - Win32 Release"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "Release"

# PROP BASE Intermediate_Dir "Release"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir "Release"

# PROP Intermediate_Dir "Release"

# 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 "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/libxml2/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_proxy_html_src" /FD /c

# ADD BASE MTL /nologo /D "NDEBUG" /win32

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG" /i "../../include" /i "../../srclib/apr/include" /I "../../srclib/apr-util/include" /i "../../srclib/libxml2/include" 

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:".\Release\mod_proxy_html.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_html.so

# ADD LINK32 kernel32.lib libxml2.lib /nologo /subsystem:windows /dll /incremental:no /libpath:"../../srclib/libxml2/win32/bin.msvc" /debug /out:".\Release\mod_proxy_html.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_html.so /opt:ref

# Begin Special Build Tool

TargetPath=.\Release\mod_proxy_html.so

SOURCE="$(InputPath)"

PostBuild_Desc=Embed .manifest

PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2

# End Special Build Tool



!ELSEIF  "$(CFG)" == "mod_proxy_html - Win32 Debug"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# PROP BASE Output_Dir "Debug"

# PROP BASE Intermediate_Dir "Debug"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 1

# PROP Output_Dir "Debug"

# PROP Intermediate_Dir "Debug"

# 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 "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/libxml2/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_proxy_html_src" /FD /c

# ADD BASE MTL /nologo /D "_DEBUG" /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x409 /d "_DEBUG"

# ADD RSC /l 0x409 /i /d "_DEBUG" "../../include" /i "../../srclib/apr/include" /I "../../srclib/apr-util/include" /i "../../srclib/libxml2/include" 

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_proxy_html.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_html.so

# ADD LINK32 kernel32.lib libxml2.lib /nologo /subsystem:windows /dll /incremental:no /libpath:"../../srclib/libxml2/win32/bin.msvc" /debug /out:".\Debug\mod_proxy_html.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_html.so

# Begin Special Build Tool

TargetPath=.\Debug\mod_proxy_html.so

SOURCE="$(InputPath)"

PostBuild_Desc=Embed .manifest

PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2

# End Special Build Tool



!ENDIF 



# Begin Target



# Name "mod_proxy_html - Win32 Release"

# Name "mod_proxy_html - Win32 Debug"

# Begin Group "Header Files"



# PROP Default_Filter "h"

# Begin Source File



SOURCE=.\mod_xml2enc.h

# End Source File

# End Group

# Begin Group "Source Files"



# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

# Begin Source File



SOURCE=.\mod_proxy_html.c

# End Source File

# Begin Source File



SOURCE=..\..\build\win32\httpd.rc

# End Source File

# End Group

# End Target

# End Project