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

  Remove a host of dependencies upon awk, using the same template for
  nearly every .rc compilation (giving the output .res file a different
  name for each component).  Adds AP_SERVER_BASEPROJECT to ap_revision.h
  so we can display the proper name of "Apache HTTP Server" as opposed
  to AP_SERVER_BASEPRODUCT (which is, and should remain, simply "Apache"
  for the server string tokens.)



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

httpd.dsp

+2 −31
Changes for httpd.dsp: 2 added lines, 31 removed lines.
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ RSC=rc.exe 
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "SHARED_MODULE" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Release\httpd" /FD /c

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

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

# ADD RSC /l 0x409 /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d "APP_FILE" /d BIN_NAME="httpd.exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -69,7 +69,7 @@ LINK32=link.exe 
# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Debug\httpd" /FD /c

# SUBTRACT CPP /YX

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

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

# ADD RSC /l 0x409 /i "./include" /i "./srclib/apr/include" /d "_DEBUG" /d "APP_FILE" /d BIN_NAME="httpd.exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -94,35 +94,6 @@ SOURCE=.\build\win32\httpd.rc 
# Begin Source File



SOURCE=.\server\main.c

# End Source File

# Begin Source File



SOURCE=.\build\win32\win32ver.awk



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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

InputPath=.\build\win32\win32ver.awk



".\build\win32\httpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ./build/win32/win32ver.awk httpd.exe "Apache HTTP Server"  ./include/ap_release.h icon=apache.ico > .\build\win32\httpd.rc



# End Custom Build



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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

InputPath=.\build\win32\win32ver.awk



".\build\win32\httpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ./build/win32/win32ver.awk httpd.exe "Apache HTTP Server"  ./include/ap_release.h icon=apache.ico > .\build\win32\httpd.rc



# End Custom Build



!ENDIF 



# End Source File

# End Target

# End Project

include/ap_release.h

+6 −3
Changes for include/ap_release.h: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line 
/* Copyright 2001-2006 The Apache Software Foundation or its licensors, as applicable.

/* Copyright 1999-2006 The Apache Software Foundation or its licensors, as

 * applicable.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -23,8 +24,9 @@ 


#include "apr_general.h" /* stringify */



#define AP_SERVER_COPYRIGHT "Copyright 2001-2006 The Apache Software Foundation" \

                            " or its licensors, as applicable."

#define AP_SERVER_COPYRIGHT \

  "Copyright 2001-2006 The Apache Software Foundation or its licensors, as " \

  "applicable."



/*

 * The below defines the base string of the Server: header. Additional
@@ -39,6 +41,7 @@ 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 

 */

#define AP_SERVER_BASEVENDOR "Apache Software Foundation"

#define AP_SERVER_BASEPROJECT "Apache HTTP Server"

#define AP_SERVER_BASEPRODUCT "Apache"



#define AP_SERVER_MAJORVERSION_NUMBER 2

libhttpd.dsp

+3 −32
Changes for libhttpd.dsp: 3 added lines, 32 removed lines.
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ RSC=rc.exe 
# 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"

# ADD RSC /l 0x409 /fo"Release/libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -78,7 +78,7 @@ PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/include" 
# 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"

# ADD RSC /l 0x409 /fo"Debug/libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "_DEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -684,36 +684,7 @@ InputPath=.\server\gen_test_char.exe 
# End Source File

# Begin Source File



SOURCE=.\build\win32\libhttpd.rc

# End Source File

# Begin Source File



SOURCE=.\build\win32\win32ver.awk



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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

InputPath=.\build\win32\win32ver.awk



".\build\win32\libhttpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ./build/win32/win32ver.awk libhttpd.dll "Apache HTTP Server Core"  ./include/ap_release.h > .\build\win32\libhttpd.rc



# End Custom Build



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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

InputPath=.\build\win32\win32ver.awk



".\build\win32\libhttpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ./build/win32/win32ver.awk libhttpd.dll "Apache HTTP Server Core"  ./include/ap_release.h > .\build\win32\libhttpd.rc



# End Custom Build



!ENDIF 



SOURCE=.\build\win32\httpd.rc

# End Source File

# End Target

# End Project

modules/aaa/mod_auth_basic.dsp

+3 −32
Changes for modules/aaa/mod_auth_basic.dsp: 3 added lines, 32 removed lines.
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ RSC=rc.exe 
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

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

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

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

# ADD RSC /l 0x409 /fo"Release/mod_auth_basic.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_auth_basic.so" /d LONG_NAME="auth_basic_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -73,7 +73,7 @@ LINK32=link.exe 
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

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

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

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

# ADD RSC /l 0x409 /fo"Debug/mod_auth_basic.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_auth_basic.so" /d LONG_NAME="auth_basic_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -93,36 +93,7 @@ SOURCE=.\mod_auth_basic.c 
# End Source File

# Begin Source File



SOURCE=.\mod_auth_basic.rc

# End Source File

# Begin Source File



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



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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

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



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

	awk -f ../../build/win32/win32ver.awk mod_auth_basic.so "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_auth_basic.rc



# End Custom Build



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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

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



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

	awk -f ../../build/win32/win32ver.awk mod_auth_basic.so "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_auth_basic.rc



# End Custom Build



!ENDIF 



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

# End Source File

# End Target

# End Project

modules/aaa/mod_auth_digest.dsp

+3 −32
Changes for modules/aaa/mod_auth_digest.dsp: 3 added lines, 32 removed lines.
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ RSC=rc.exe 
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

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

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

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

# ADD RSC /l 0x409 /fo"Release/mod_auth_digest.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_auth_digest.so" /d LONG_NAME="auth_digest_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -73,7 +73,7 @@ LINK32=link.exe 
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

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

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

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

# ADD RSC /l 0x409 /fo"Debug/mod_auth_digest.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_auth_digest.so" /d LONG_NAME="auth_digest_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -93,36 +93,7 @@ SOURCE=.\mod_auth_digest.c 
# End Source File

# Begin Source File



SOURCE=.\mod_auth_digest.rc

# End Source File

# Begin Source File



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



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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

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



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

	awk -f ../../build/win32/win32ver.awk mod_auth_digest.so "auth_digest_module for Apache" ../../include/ap_release.h > .\mod_auth_digest.rc



# End Custom Build



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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

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



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

	awk -f ../../build/win32/win32ver.awk mod_auth_digest.so "auth_digest_module for Apache" ../../include/ap_release.h > .\mod_auth_digest.rc



# End Custom Build



!ENDIF 



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

# End Source File

# End Target

# End Project