From 2ae737e3e9e092352e9e98f4bd9651fdc8bfbc5a Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Sat, 13 Jul 2002 03:29:49 +0000 Subject: [PATCH] Final tweak and CREDITs ... switch the order to simplify things, and pull out the old dependency on ApacheMonitorVersion.rc git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96038 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ support/win32/ApacheMonitor.dsp | 8 ++++---- support/win32/ApacheMonitor.rc.in | 4 ---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index bec58dbb0e..765bac06a4 100644 --- a/CHANGES +++ b/CHANGES @@ -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 ] + *) mod_ext_filter: don't segfault if content-type is not set. PR 10617. [Arthur P. Smith , Jeff Trawick] diff --git a/support/win32/ApacheMonitor.dsp b/support/win32/ApacheMonitor.dsp index 0f9d37a787..78ccade3be 100644 --- a/support/win32/ApacheMonitor.dsp +++ b/support/win32/ApacheMonitor.dsp @@ -133,8 +133,8 @@ SOURCE=..\..\build\win32\win32ver.awk 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 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 diff --git a/support/win32/ApacheMonitor.rc.in b/support/win32/ApacheMonitor.rc.in index af51cc3b3f..2028623bc1 100644 --- a/support/win32/ApacheMonitor.rc.in +++ b/support/win32/ApacheMonitor.rc.in @@ -58,14 +58,10 @@ #include -#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 | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -- 2.40.0