httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/support/win32 .cvsignore ApacheMonitor.dsp ApacheMonitor.h
Date Sat, 13 Jul 2002 05:09:52 GMT
wrowe       2002/07/12 22:09:52

  Modified:    support/win32 .cvsignore ApacheMonitor.dsp ApacheMonitor.h
  Log:
    Ok.  This gives us one warning - could not scan ApacheMonitorVer.h for
    dependencies.  But it gives us back our top level, editable and commitable
    ApacheMonitor.rc file, and doesn't mess up dependencies due to the presence
    of two different .rc files in the schema (which is partly what messed up
    the original case.)
  
  Revision  Changes    Path
  1.8       +1 -1      httpd-2.0/support/win32/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/win32/.cvsignore,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- .cvsignore	5 Jun 2002 14:56:46 -0000	1.7
  +++ .cvsignore	13 Jul 2002 05:09:52 -0000	1.8
  @@ -1,6 +1,6 @@
   Release
   Debug
  -ApacheMonitorVersion.rc
  +ApacheMonitorVer.h
   wintty.rc
   *.plg
   *.aps
  
  
  
  1.18      +41 -32    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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ApacheMonitor.dsp	13 Jul 2002 03:29:49 -0000	1.17
  +++ ApacheMonitor.dsp	13 Jul 2002 05:09:52 -0000	1.18
  @@ -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 /d "NDEBUG"
  +# ADD RSC /l 0x409 /i ".\\" /d "NDEBUG"
   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 /d "_DEBUG"
  +# ADD RSC /l 0x409 /i ".\\" /d "_DEBUG"
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -87,6 +87,45 @@
   
   # Name "ApacheMonitor - Win32 Release"
   # Name "ApacheMonitor - Win32 Debug"
  +# Begin Group "Generated Files"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\ApacheMonitorVer.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\..\build\win32\win32ver.awk
  +
  +!IF  "$(CFG)" == "ApacheMonitor - Win32 Release"
  +
  +# PROP Ignore_Default_Tool 1
  +USERDEP__WIN32="..\..\include\ap_release.h"	
  +# Begin Custom Build - Creating Version Resource
  +InputPath=..\..\build\win32\win32ver.awk
  +
  +".\ApacheMonitorVer.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h
> ApacheMonitorVer.h
  +
  +# End Custom Build
  +
  +!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
  +
  +# PROP Ignore_Default_Tool 1
  +USERDEP__WIN32="..\..\include\ap_release.h"	
  +# Begin Custom Build - Creating Version Resource
  +InputPath=..\..\build\win32\win32ver.awk
  +
  +".\ApacheMonitorVer.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h
> ApacheMonitorVer.h
  +
  +# End Custom Build
  +
  +!ENDIF 
  +
  +# End Source File
  +# End Group
   # Begin Group "Resource Files"
   
   # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
  @@ -121,36 +160,6 @@
   # Begin Source File
   
   SOURCE=.\sstop.bmp
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\build\win32\win32ver.awk
  -
  -!IF  "$(CFG)" == "ApacheMonitor - Win32 Release"
  -
  -# PROP Ignore_Default_Tool 1
  -# Begin Custom Build - Creating Version Resource
  -InputPath=..\..\build\win32\win32ver.awk
  -
  -".\ApacheMonitor.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	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
  -
  -!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
  -
  -# Begin Custom Build - Creating Version Resource
  -InputPath=..\..\build\win32\win32ver.awk
  -
  -".\ApacheMonitor.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	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
  -
  -!ENDIF 
  -
   # End Source File
   # End Group
   # Begin Source File
  
  
  
  1.8       +62 -0     httpd-2.0/support/win32/ApacheMonitor.h
  
  Index: ApacheMonitor.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/win32/ApacheMonitor.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ApacheMonitor.h	27 Nov 2001 03:58:41 -0000	1.7
  +++ ApacheMonitor.h	13 Jul 2002 05:09:52 -0000	1.8
  @@ -1,3 +1,64 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
  +/* Resource definitions for ApacheMonitor.rc and ApacheMonitor.c
  + */
  +
   #define IDD_DLGSERVICES                 101
   #define IDS_APMONITORTITLE              102
   #define IDS_APMONITORCLASS              103
  @@ -53,3 +114,4 @@
   #define IDM_SM_STOP                     0x1400
   #define IDM_SM_RESTART                  0x1800
   #define IDC_STATIC                      -1
  +
  
  
  

Mime
View raw message