You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/07/13 05:29:50 UTC
cvs commit: httpd-2.0/support/win32 ApacheMonitor.dsp ApacheMonitor.rc.in
wrowe 2002/07/12 20:29:50
Modified: . CHANGES
support/win32 ApacheMonitor.dsp ApacheMonitor.rc.in
Log:
Final tweak and CREDITs ... switch the order to simplify things, and
pull out the old dependency on ApacheMonitorVersion.rc
Revision Changes Path
1.863 +4 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.862
retrieving revision 1.863
diff -u -r1.862 -r1.863
--- CHANGES 12 Jul 2002 05:55:21 -0000 1.862
+++ CHANGES 13 Jul 2002 03:29:49 -0000 1.863
@@ -1,5 +1,9 @@
Changes with Apache 2.0.40
+ *) Fix a dependency error when building ApacheMonitor, so that Win32
+ and MSVC now trust that the project is current (when it is).
+ [James Cox <im...@php.net>]
+
*) mod_ext_filter: don't segfault if content-type is not set. PR 10617.
[Arthur P. Smith <ap...@aps.org>, Jeff Trawick]
1.17 +4 -4 httpd-2.0/support/win32/ApacheMonitor.dsp
Index: ApacheMonitor.dsp
===================================================================
RCS file: /home/cvs/httpd-2.0/support/win32/ApacheMonitor.dsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ApacheMonitor.dsp 13 Jul 2002 03:18:21 -0000 1.16
+++ ApacheMonitor.dsp 13 Jul 2002 03:29:49 -0000 1.17
@@ -133,8 +133,8 @@
InputPath=..\..\build\win32\win32ver.awk
".\ApacheMonitor.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk ApacheMonitor "Apache HTTP Server Monitor" ../../include/ap_release.h > .\ApacheMonitor.rc
- copy ApacheMonitor.rc + ApacheMonitor.rc.in
+ type ApacheMonitor.rc.in > ApacheMonitor.rc
+ awk -f ../../build/win32/win32ver.awk ApacheMonitor "Apache HTTP Server Monitor" ../../include/ap_release.h >> .\ApacheMonitor.rc
# End Custom Build
@@ -144,8 +144,8 @@
InputPath=..\..\build\win32\win32ver.awk
".\ApacheMonitor.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk ApacheMonitor "Apache HTTP Server Monitor" ../../include/ap_release.h > .\ApacheMonitor.rc
- copy ApacheMonitor.rc + ApacheMonitor.rc.in
+ type ApacheMonitor.rc.in > ApacheMonitor.rc
+ awk -f ../../build/win32/win32ver.awk ApacheMonitor "Apache HTTP Server Monitor" ../../include/ap_release.h >> .\ApacheMonitor.rc
# End Custom Build
1.2 +0 -4 httpd-2.0/support/win32/ApacheMonitor.rc.in
Index: ApacheMonitor.rc.in
===================================================================
RCS file: /home/cvs/httpd-2.0/support/win32/ApacheMonitor.rc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheMonitor.rc.in 13 Jul 2002 03:18:21 -0000 1.1
+++ ApacheMonitor.rc.in 13 Jul 2002 03:29:49 -0000 1.2
@@ -58,13 +58,9 @@
#include <windows.h>
-#include "ApacheMonitor.h"
-
IDI_APSRVMON ICON DISCARDABLE "ApacheMonitor.ico"
IDI_ICOSTOP ICON DISCARDABLE "apstop.ico"
IDI_ICORUN ICON DISCARDABLE "aprun.ico"
-
-#include "ApacheMonitorVersion.rc"
IDD_DLGSERVICES DIALOGEX 0, 0, 350, 188
STYLE DS_MODALFRAME | DS_SETFOREGROUND | WS_MINIMIZEBOX | WS_VISIBLE |