Include ApacheMonitor/wintty in the build.

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

diff --git a/Apache.dsw b/Apache.dsw
index 826991160535df963c6921a20a571362ee0ffdbb..e8888b70832ee884eac7e2d19b53b7c49a8a292a 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -1,8 +1,41 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
+Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 
+Project: "Apache"=".\Apache.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "ApacheMonitor"=".\support\win32\ApacheMonitor.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "InstallBin"=".\InstallBin.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -15,19 +48,22 @@ Package=<4>
     Project_Dep_Name Apache
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name ApacheMonitor
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_auth_anon
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_auth_dbm
+    Project_Dep_Name mod_cern_meta
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_auth_digest
+    Project_Dep_Name mod_dav_fs
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_cern_meta
+    Project_Dep_Name mod_auth_dbm
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_dav_fs
+    Project_Dep_Name mod_auth_digest
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name mod_expires
@@ -39,6 +75,9 @@ Package=<4>
     Project_Dep_Name mod_headers
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_info
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_rewrite
     End Project Dependency
     Begin Project Dependency
@@ -66,28 +105,7 @@ Package=<4>
     Project_Dep_Name rotatelogs
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_info
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "Apache"=".\Apache.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libapr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libhttpd
+    Project_Dep_Name wintty
     End Project Dependency
 }}}
 
@@ -651,6 +669,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "wintty"=".\support\win32\wintty.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "xml"=".\srclib\apr-util\xml\expat\lib\xml.dsp" - Package Owner=<4>
 
 Package=<5>

diff --git a/Makefile.win b/Makefile.win
index 52e9aa78a30da6cb436bfc624e3c5be092711bfe..a6e40979e876c2340830504c2a0d6b1987273f5f 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -170,6 +170,10 @@ _build:
         $(MAKE) $(MAKEOPT) -f logresolve.mak CFG="logresolve - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f rotatelogs.mak CFG="rotatelogs - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..
+       cd support\win32
+         $(MAKE) $(MAKEOPT) -f ApacheMonitor.mak CFG="ApacheMonitor - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+         $(MAKE) $(MAKEOPT) -f wintty.mak CFG="wintty - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       cd ..\..
 
 _install:
        -mkdir "$(INSTDIR)"
@@ -219,6 +223,8 @@ _install:
        copy support\$(LONG)\htdigest.exe "$(INSTDIR)\bin"
        copy support\$(LONG)\logresolve.exe "$(INSTDIR)\bin"
        copy support\$(LONG)\rotatelogs.exe "$(INSTDIR)\bin"
+        copy support\win32\$(LONG)\ApacheMonitor.exe "$(INSTDIR)\bin"
+        copy support\win32\$(LONG)\wintty.exe "$(INSTDIR)\bin"
         copy docs\cgi-examples\printenv "$(INSTDIR)\cgi-bin\printenv.pl"
        -awk -f <<script.awk "docs\cgi-examples\printenv" "$(INSTDIR)\cgi-bin\printenv.pl"
     BEGIN { 

diff --git a/support/win32/ApacheMonitor.mak b/support/win32/ApacheMonitor.mak
new file mode 100644 (file)
index 0000000..32679d6
--- /dev/null
+++ b/support/win32/ApacheMonitor.mak
@@ -0,0 +1,195 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on ApacheMonitor.dsp
+!IF "$(CFG)" == ""
+CFG=ApacheMonitor - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to ApacheMonitor - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "ApacheMonitor - Win32 Release" && "$(CFG)" !=\
+ "ApacheMonitor - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "ApacheMonitor.mak" CFG="ApacheMonitor - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "ApacheMonitor - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "ApacheMonitor - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "ApacheMonitor - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\ApacheMonitor.exe"
+
+!ELSE 
+
+ALL : "$(OUTDIR)\ApacheMonitor.exe"
+
+!ENDIF 
+
+CLEAN :
+       -@erase "$(INTDIR)\ApacheMonitor.idb"
+       -@erase "$(INTDIR)\ApacheMonitor.obj"
+       -@erase "$(INTDIR)\ApacheMonitor.res"
+       -@erase "$(OUTDIR)\ApacheMonitor.exe"
+       -@erase "$(OUTDIR)\ApacheMonitor.map"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheMonitor" /FD /c 
+CPP_OBJS=.\Release/
+CPP_SBRS=.
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ApacheMonitor.res" /d "NDEBUG" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheMonitor.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib comctl32.lib\
+ shell32.lib version.lib /nologo /subsystem:windows /incremental:no\
+ /pdb:"$(OUTDIR)\ApacheMonitor.pdb" /map:"$(INTDIR)\ApacheMonitor.map"\
+ /machine:I386 /out:"$(OUTDIR)\ApacheMonitor.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\ApacheMonitor.obj" \
+       "$(INTDIR)\ApacheMonitor.res"
+
+"$(OUTDIR)\ApacheMonitor.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\ApacheMonitor.exe"
+
+!ELSE 
+
+ALL : "$(OUTDIR)\ApacheMonitor.exe"
+
+!ENDIF 
+
+CLEAN :
+       -@erase "$(INTDIR)\ApacheMonitor.idb"
+       -@erase "$(INTDIR)\ApacheMonitor.obj"
+       -@erase "$(INTDIR)\ApacheMonitor.res"
+       -@erase "$(OUTDIR)\ApacheMonitor.exe"
+       -@erase "$(OUTDIR)\ApacheMonitor.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheMonitor" /FD /c 
+CPP_OBJS=.\Debug/
+CPP_SBRS=.
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ApacheMonitor.res" /d "_DEBUG" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheMonitor.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib comctl32.lib\
+ shell32.lib version.lib /nologo /subsystem:windows /incremental:no\
+ /pdb:"$(OUTDIR)\ApacheMonitor.pdb" /debug /machine:I386\
+ /out:"$(OUTDIR)\ApacheMonitor.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\ApacheMonitor.obj" \
+       "$(INTDIR)\ApacheMonitor.res"
+
+"$(OUTDIR)\ApacheMonitor.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(CFG)" == "ApacheMonitor - Win32 Release" || "$(CFG)" ==\
+ "ApacheMonitor - Win32 Debug"
+SOURCE=.\ApacheMonitor.rc
+DEP_RSC_APACH=\
+       ".\apache_header.bmp"\
+       ".\ApacheMonitor.ico"\
+       ".\aprun.ico"\
+       ".\apsmall.ico"\
+       ".\apsrvmon.ico"\
+       ".\apstop.ico"\
+       ".\srun.bmp"\
+       ".\sstop.bmp"\
+       
+
+"$(INTDIR)\ApacheMonitor.res" : $(SOURCE) $(DEP_RSC_APACH) "$(INTDIR)"
+       $(RSC) $(RSC_PROJ) $(SOURCE)
+
+
+SOURCE=.\ApacheMonitor.c
+
+"$(INTDIR)\ApacheMonitor.obj" : $(SOURCE) "$(INTDIR)"
+
+
+
+!ENDIF 
+

diff --git a/support/win32/wintty.mak b/support/win32/wintty.mak
new file mode 100644 (file)
index 0000000..d5f0c07
--- /dev/null
+++ b/support/win32/wintty.mak
@@ -0,0 +1,171 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on wintty.dsp
+!IF "$(CFG)" == ""
+CFG=wintty - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to wintty - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "wintty - Win32 Release" && "$(CFG)" != "wintty - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "wintty.mak" CFG="wintty - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "wintty - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "wintty - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "wintty - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\wintty.exe"
+
+!ELSE 
+
+ALL : "$(OUTDIR)\wintty.exe"
+
+!ENDIF 
+
+CLEAN :
+       -@erase "$(INTDIR)\wintty.idb"
+       -@erase "$(INTDIR)\wintty.obj"
+       -@erase "$(OUTDIR)\wintty.exe"
+       -@erase "$(OUTDIR)\wintty.map"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /O2 /I "../srclib/apr/include" /I\
+ "../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D\
+ "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\
+ /Fd"$(INTDIR)\wintty" /FD /c 
+CPP_OBJS=.\Release/
+CPP_SBRS=.
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\wintty.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console\
+ /incremental:no /pdb:"$(OUTDIR)\wintty.pdb" /map:"$(INTDIR)\wintty.map"\
+ /machine:I386 /out:"$(OUTDIR)\wintty.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\wintty.obj"
+
+"$(OUTDIR)\wintty.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "wintty - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\wintty.exe"
+
+!ELSE 
+
+ALL : "$(OUTDIR)\wintty.exe"
+
+!ENDIF 
+
+CLEAN :
+       -@erase "$(INTDIR)\wintty.idb"
+       -@erase "$(INTDIR)\wintty.obj"
+       -@erase "$(OUTDIR)\wintty.exe"
+       -@erase "$(OUTDIR)\wintty.map"
+       -@erase "$(OUTDIR)\wintty.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/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" /Fo"$(INTDIR)\\"\
+ /Fd"$(INTDIR)\wintty" /FD /c 
+CPP_OBJS=.\Debug/
+CPP_SBRS=.
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\wintty.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console\
+ /incremental:no /pdb:"$(OUTDIR)\wintty.pdb" /map:"$(INTDIR)\wintty.map" /debug\
+ /machine:I386 /out:"$(OUTDIR)\wintty.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\wintty.obj"
+
+"$(OUTDIR)\wintty.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(CFG)" == "wintty - Win32 Release" || "$(CFG)" == "wintty - Win32 Debug"
+SOURCE=.\wintty.c
+
+"$(INTDIR)\wintty.obj" : $(SOURCE) "$(INTDIR)"
+
+
+
+!ENDIF 
+