Commit aed63349 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Two more loadable modules on Win32, thank you Gunther!


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

Apache.dsw

+44 −5
Original line number Diff line number Diff line
@@ -54,16 +54,16 @@ Package=<4> 
    Project_Dep_Name mod_auth_anon

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_cern_meta

    Project_Dep_Name mod_auth_dbm

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_dav_fs

    Project_Dep_Name mod_auth_digest

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_auth_dbm

    Project_Dep_Name mod_cern_meta

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_auth_digest

    Project_Dep_Name mod_dav_fs

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_expires
@@ -87,10 +87,13 @@ Package=<4> 
    Project_Dep_Name mod_status

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_unique_id

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_usertrack

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_proxy

    Project_Dep_Name mod_vhost_alias

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name proxy_connect
@@ -618,6 +621,24 @@ Package=<4> 


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



Project: "mod_unique_id"=".\modules\metadata\mod_unique_id.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_usertrack"=".\modules\metadata\mod_usertrack.dsp" - Package Owner=<4>



Package=<5>
@@ -636,6 +657,24 @@ Package=<4> 


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



Project: "mod_vhost_alias"=".\modules\mappers\mod_vhost_alias.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_proxy"=".\modules\proxy\mod_proxy.dsp" - Package Owner=<4>



Package=<5>

Makefile.win

+6 −0
Original line number Diff line number Diff line
@@ -152,11 +152,13 @@ _build: 
	cd modules\mappers

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

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

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

	cd ..\..

	cd modules\metadata

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

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

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

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

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

	cd ..\..

	cd modules\proxy
@@ -219,9 +221,11 @@ _build: 
        	"mod_status - Win32 $(LONG)"\

		"mod_rewrite - Win32 $(LONG)"\

		"mod_speling - Win32 $(LONG)"\

		"mod_vhost_alias - Win32 $(LONG)"\

		"mod_cern_meta - Win32 $(LONG)"\

		"mod_expires - Win32 $(LONG)"\

		"mod_headers - Win32 $(LONG)"\

		"mod_unique_id - Win32 $(LONG)"\

		"mod_usertrack - Win32 $(LONG)"\

		"mod_proxy - Win32 $(LONG)"\

		"proxy_connect - Win32 $(LONG)"\
@@ -287,9 +291,11 @@ _install: 
        copy modules\generators\$(LONG)\mod_status.so "$(INSTDIR)\modules"

        copy modules\mappers\$(LONG)\mod_rewrite.so "$(INSTDIR)\modules"

	copy modules\mappers\$(LONG)\mod_speling.so "$(INSTDIR)\modules"

	copy modules\mappers\$(LONG)\mod_vhost_alias.so "$(INSTDIR)\modules"

	copy modules\metadata\$(LONG)\mod_cern_meta.so "$(INSTDIR)\modules"

	copy modules\metadata\$(LONG)\mod_expires.so "$(INSTDIR)\modules"

	copy modules\metadata\$(LONG)\mod_headers.so "$(INSTDIR)\modules"

	copy modules\metadata\$(LONG)\mod_unique_id.so "$(INSTDIR)\modules"

	copy modules\metadata\$(LONG)\mod_usertrack.so "$(INSTDIR)\modules"

	copy modules\proxy\$(LONG)\mod_proxy.so "$(INSTDIR)\modules"

	copy modules\proxy\$(LONG)\proxy_connect.so "$(INSTDIR)\modules"

modules/mappers/mod_vhost_alias.dsp

0 → 100644
+128 −0
Original line number Diff line number Diff line 
# Microsoft Developer Studio Project File - Name="mod_vhost_alias" - 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_vhost_alias - 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_vhost_alias.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_vhost_alias.mak" CFG="mod_vhost_alias - Win32 Release"

!MESSAGE 

!MESSAGE Possible choices for configuration are:

!MESSAGE 

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

!MESSAGE "mod_vhost_alias - 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_vhost_alias - 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 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_vhost_alias" /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"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

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

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



!ELSEIF  "$(CFG)" == "mod_vhost_alias - 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 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_vhost_alias" /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 /d "_DEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

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

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



!ENDIF 



# Begin Target



# Name "mod_vhost_alias - Win32 Release"

# Name "mod_vhost_alias - Win32 Debug"

# Begin Source File



SOURCE=.\mod_vhost_alias.c

# End Source File

# Begin Source File



SOURCE=.\mod_vhost_alias.rc

# End Source File

# Begin Source File



SOURCE=..\..\build\win32\win32ver.awk



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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

InputPath=..\..\build\win32\win32ver.awk



".\mod_vhost_alias.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ../../build/win32/win32ver.awk mod_vhost_alias  "vhost_alias_module for Apache" ../../include/ap_release.h > .\mod_vhost_alias.rc



# End Custom Build



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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

InputPath=..\..\build\win32\win32ver.awk



".\mod_vhost_alias.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ../../build/win32/win32ver.awk mod_vhost_alias  "vhost_alias_module for Apache" ../../include/ap_release.h > .\mod_vhost_alias.rc



# End Custom Build



!ENDIF 



# End Source File

# End Target

# End Project

modules/metadata/mod_unique_id.dsp

0 → 100644
+128 −0
Original line number Diff line number Diff line 
# Microsoft Developer Studio Project File - Name="mod_unique_id" - 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_unique_id - 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_unique_id.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_unique_id.mak" CFG="mod_unique_id - Win32 Release"

!MESSAGE 

!MESSAGE Possible choices for configuration are:

!MESSAGE 

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

!MESSAGE "mod_unique_id - 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_unique_id - 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 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_unique_id" /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"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

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

# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_unique_id.so" /base:@..\..\os\win32\BaseAddr.ref,mod_unique_id



!ELSEIF  "$(CFG)" == "mod_unique_id - 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 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_unique_id" /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 /d "_DEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

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

# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_unique_id.so" /base:@..\..\os\win32\BaseAddr.ref,mod_unique_id



!ENDIF 



# Begin Target



# Name "mod_unique_id - Win32 Release"

# Name "mod_unique_id - Win32 Debug"

# Begin Source File



SOURCE=.\mod_unique_id.c

# End Source File

# Begin Source File



SOURCE=.\mod_unique_id.rc

# End Source File

# Begin Source File



SOURCE=..\..\build\win32\win32ver.awk



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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

InputPath=..\..\build\win32\win32ver.awk



".\mod_unique_id.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ../../build/win32/win32ver.awk mod_unique_id  "unique_id_module for Apache" ../../include/ap_release.h  > .\mod_unique_id.rc



# End Custom Build



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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

InputPath=..\..\build\win32\win32ver.awk



".\mod_unique_id.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ../../build/win32/win32ver.awk mod_unique_id  "unique_id_module for Apache" ../../include/ap_release.h  > .\mod_unique_id.rc



# End Custom Build



!ENDIF 



# End Source File

# End Target

# End Project

os/win32/BaseAddr.ref

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ mod_status 0x6FE50000 0x00010000 
mod_usertrack        0x6FE40000    0x00010000

mod_file_cache       0x6FE20000    0x00020000

mod_auth_dbm         0x6FE10000    0x00010000

mod_unique_id        0x6FE00000    0x00010000

mod_vhost_alias      0x6FDF0000    0x00010000

mod_dav_fs           0x6FDE0000    0x00010000

mod_dav              0x6FDC0000    0x00020000

mod_proxy            0x6FDB0000    0x00010000