httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r395418 [3/3] - in /httpd/httpd/trunk: ./ include/ modules/aaa/ modules/arch/win32/ modules/cache/ modules/database/ modules/dav/fs/ modules/dav/main/ modules/debug/ modules/echo/ modules/filters/ modules/generators/ modules/http/ modules/l...
Date Wed, 19 Apr 2006 22:48:06 GMT
Modified: httpd/httpd/trunk/support/rotatelogs.dsp
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/rotatelogs.dsp?rev=395418&r1=395417&r2=395418&view=diff
==============================================================================
--- httpd/httpd/trunk/support/rotatelogs.dsp (original)
+++ httpd/httpd/trunk/support/rotatelogs.dsp Wed Apr 19 15:47:49 2006
@@ -44,7 +44,7 @@
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /FD /c
 # ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Release/rotatelogs_src"
/FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/rotatelogs.res" /i "../include" /i "../srclib/apr/include"
/d "NDEBUG" /d "APP_FILE" /d BIN_NAME="rotatelogs.exe" /d LONG_NAME="Apache rotatelogs command
line pipe"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -68,7 +68,7 @@
 # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
 # ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/rotatelogs_src"
/FD /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/rotatelogs.res" /i "../include" /i "../srclib/apr/include" /d
"_DEBUG" /d "APP_FILE" /d BIN_NAME="rotatelogs.exe" /d LONG_NAME="Apache rotatelogs command
line pipe"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -88,36 +88,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\rotatelogs.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\build\win32\win32ver.awk
-
-!IF  "$(CFG)" == "rotatelogs - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\build\win32\win32ver.awk
-
-".\rotatelogs.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	awk -f ../build/win32/win32ver.awk rotatelogs.exe "rotatelogs Utility"  ../include/ap_release.h
> .\rotatelogs.rc
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "rotatelogs - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\build\win32\win32ver.awk
-
-".\rotatelogs.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	awk -f ../build/win32/win32ver.awk rotatelogs.exe "rotatelogs Utility"  ../include/ap_release.h
> .\rotatelogs.rc
-
-# End Custom Build
-
-!ENDIF 
-
+SOURCE=..\build\win32\httpd.rc
 # End Source File
 # End Target
 # End Project

Modified: httpd/httpd/trunk/support/win32/ApacheMonitor.dsp
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/win32/ApacheMonitor.dsp?rev=395418&r1=395417&r2=395418&view=diff
==============================================================================
--- httpd/httpd/trunk/support/win32/ApacheMonitor.dsp (original)
+++ httpd/httpd/trunk/support/win32/ApacheMonitor.dsp Wed Apr 19 15:47:49 2006
@@ -47,7 +47,7 @@
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "../../include" /I "../../srclib/apr/include" /d "NDEBUG"
+# ADD RSC /l 0x409 /i "../../include" /I "../../srclib/apr/include" /d "NDEBUG" /d "APP_FILE"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -73,7 +73,7 @@
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../../include" /I "../../srclib/apr/include" /d "_DEBUG"
+# ADD RSC /l 0x409 /i "../../include" /I "../../srclib/apr/include" /d "_DEBUG" /d "APP_FILE"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

Modified: httpd/httpd/trunk/support/win32/ApacheMonitor.rc
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/win32/ApacheMonitor.rc?rev=395418&r1=395417&r2=395418&view=diff
==============================================================================
--- httpd/httpd/trunk/support/win32/ApacheMonitor.rc (original)
+++ httpd/httpd/trunk/support/win32/ApacheMonitor.rc Wed Apr 19 15:47:49 2006
@@ -18,7 +18,11 @@
 
 #include "ApacheMonitor.h"
 
-#include "ap_release.h"
+#define LONG_NAME Apache HTTP Server Monitor
+#define BIN_NAME  ApacheMonitor.exe
+
+#include "../../build/win32/httpd.rc"
+
 
 IDI_APSRVMON            ICON    DISCARDABLE     "ApacheMonitor.ico"
 IDI_ICOSTOP             ICON    DISCARDABLE     "apstop.ico"
@@ -96,42 +100,4 @@
     IDS_MSG_SERVICES        "Ser&vices"
     IDS_MSG_CONNECT         "&Connect"
     IDS_MSG_ECONNECT        "Unable to connect to the remote registry on %s"
-END
-
-1 VERSIONINFO
- FILEVERSION AP_SERVER_PATCHLEVEL_CSV,0
- PRODUCTVERSION AP_SERVER_PATCHLEVEL_CSV,0
- FILEFLAGSMASK 0x3fL
-#if defined(_DEBUG)
- FILEFLAGS 0x03L
-#else
-#if AP_SERVER_DEVBUILD_BOOLEAN
- FILEFLAGS 0x02L
-#else
- FILEFLAGS 0x0L
-#endif
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904b0"
-    BEGIN
-      VALUE "Comments", "Licensed under the Apache License, Version 2.0 (the ""License"");
you may not use this file except in compliance with the License.  You may obtain a copy of
the License at\r\n\r\nhttp://www.apache.org/licenses/LICENSE-2.0\r\n\r\nUnless required by
applicable law or agreed to in writing, software distributed under the License is distributed
on an ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and limitations under the
License.\0"
-      VALUE "CompanyName", AP_SERVER_BASEVENDOR "\0"
-      VALUE "FileDescription", "Apache HTTP Server Monitor\0"
-      VALUE "FileVersion", AP_SERVER_BASEREVISION "\0"
-      VALUE "InternalName", "ApacheMonitor.exe\0"
-      VALUE "LegalCopyright", "Copyright 2001-2006 The Apache Software Foundation\0"
-      VALUE "OriginalFilename", "ApacheMonitor.exe\0"
-      VALUE "ProductName", "Apache HTTP Server\0"
-      VALUE "ProductVersion", AP_SERVER_BASEREVISION "\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x409, 1200
-  END
 END

Modified: httpd/httpd/trunk/support/win32/wintty.dsp
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/win32/wintty.dsp?rev=395418&r1=395417&r2=395418&view=diff
==============================================================================
--- httpd/httpd/trunk/support/win32/wintty.dsp (original)
+++ httpd/httpd/trunk/support/win32/wintty.dsp Wed Apr 19 15:47:49 2006
@@ -44,7 +44,7 @@
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /FD /c
 # ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Release/wintty_src"
/FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/wintty.res" /i "../../include" /i "../../srclib/apr/include"
/d "NDEBUG" /d "APP_FILE" /d BIN_NAME="wintty.exe" /d LONG_NAME="Apache wintty console pipe"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -68,7 +68,7 @@
 # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
 # ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/wintty_src"
/FD /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/wintty.res" /i "../../include" /i "../../srclib/apr/include"
/d "_DEBUG" /d "APP_FILE" /d BIN_NAME="wintty.exe" /d LONG_NAME="Apache wintty console pipe"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -84,40 +84,11 @@
 # Name "wintty - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF  "$(CFG)" == "wintty - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\wintty.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	awk -f ../../build/win32/win32ver.awk wintty.exe "wintty Console Utility" ../../include/ap_release.h
> .\wintty.rc
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wintty - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\wintty.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	awk -f ../../build/win32/win32ver.awk wintty.exe "wintty Console Utility" ../../include/ap_release.h
> .\wintty.rc
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\wintty.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\wintty.rc
+SOURCE=..\..\build\win32\httpd.rc
 # End Source File
 # End Target
 # End Project



Mime
View raw message