--------------------- PatchSet 6652 Date: 2005/05/01 07:50:11 Author: serassio Branch: nt-2_5 Tag: (none) Log: Updated Visual Studio Project for automatic man pages building Members: port/win32/Makefile.am:1.1.2.7->1.1.2.8 port/win32/doc.dsp:1.1->1.1.2.1 port/win32/squid.dsw:1.1.2.26->1.1.2.27 port/win32/squid_mswin.mak:1.1.2.7->1.1.2.8 port/win32/update.cmd:1.1.2.22->1.1.2.23 Index: squid/port/win32/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/Makefile.am,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- squid/port/win32/Makefile.am 27 Nov 2004 13:03:44 -0000 1.1.2.7 +++ squid/port/win32/Makefile.am 1 May 2005 07:50:11 -0000 1.1.2.8 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in # -# $Id: Makefile.am,v 1.1.2.7 2004/11/27 13:03:44 serassio Exp $ +# $Id: Makefile.am,v 1.1.2.8 2005/05/01 07:50:11 serassio Exp $ # EXTRA_DIST = \ @@ -8,6 +8,7 @@ Build.dsp \ cf_data.dsp \ default_config_file.cmd \ + doc.dsp \ icons.cmd \ icons.dsp \ install.dsp \ --- /dev/null Wed Feb 14 01:12:46 2007 +++ squid/port/win32/doc.dsp Wed Feb 14 01:12:46 2007 @@ -0,0 +1,133 @@ +# Microsoft Developer Studio Project File - Name="doc" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Generic Project" 0x010a + +CFG=doc - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "doc.mak". +!MESSAGE +!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 "doc.mak" CFG="doc - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "doc - Win32 Release" (based on "Win32 (x86) Generic Project") +!MESSAGE "doc - Win32 Debug" (based on "Win32 (x86) Generic Project") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +MTL=midl.exe + +!IF "$(CFG)" == "doc - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "doc___Win32_Release" +# PROP BASE Intermediate_Dir "doc___Win32_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "doc___Win32_Release" +# PROP Intermediate_Dir "doc___Win32_Release" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "doc - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "doc___Win32_Debug" +# PROP BASE Intermediate_Dir "doc___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "doc___Win32_Debug" +# PROP Intermediate_Dir "doc___Win32_Debug" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "doc - Win32 Release" +# Name "doc - Win32 Debug" +# Begin Source File + +SOURCE=..\..\doc\cachemgr.cgi.8.in + +!IF "$(CFG)" == "doc - Win32 Release" + +# PROP Ignore_Default_Tool 1 +USERDEP__CACHE="squid_mswin.mak" +# Begin Custom Build +InputDir=\work\nt-2.5\doc +ProjDir=. +InputPath=..\..\doc\cachemgr.cgi.8.in + +"$(InputDir)\cachemgr.cgi.8" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nmake /f $(ProjDir)\squid_mswin.mak cachemgr.cgi.8 + +# End Custom Build + +!ELSEIF "$(CFG)" == "doc - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +USERDEP__CACHE="squid_mswin.mak" +# Begin Custom Build +InputDir=\work\nt-2.5\doc +ProjDir=. +InputPath=..\..\doc\cachemgr.cgi.8.in + +"$(InputDir)\cachemgr.cgi.8" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nmake /f $(ProjDir)\squid_mswin.mak cachemgr.cgi.8 + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\doc\squid.8.in + +!IF "$(CFG)" == "doc - Win32 Release" + +# PROP Ignore_Default_Tool 1 +USERDEP__SQUID="squid_mswin.mak" +# Begin Custom Build +InputDir=\work\nt-2.5\doc +ProjDir=. +InputPath=..\..\doc\squid.8.in + +"$(InputDir)\squid.8" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nmake /f $(ProjDir)\squid_mswin.mak squid.8 + +# End Custom Build + +!ELSEIF "$(CFG)" == "doc - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +USERDEP__SQUID="squid_mswin.mak" +# Begin Custom Build +InputDir=\work\nt-2.5\doc +ProjDir=. +InputPath=..\..\doc\squid.8.in + +"$(InputDir)\squid.8" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nmake /f $(ProjDir)\squid_mswin.mak squid.8 + +# End Custom Build + +!ENDIF + +# End Source File +# End Target +# End Project Index: squid/port/win32/squid.dsw =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid.dsw,v retrieving revision 1.1.2.26 retrieving revision 1.1.2.27 diff -u -r1.1.2.26 -r1.1.2.27 --- squid/port/win32/squid.dsw 27 Nov 2004 11:37:32 -0000 1.1.2.26 +++ squid/port/win32/squid.dsw 1 May 2005 07:50:11 -0000 1.1.2.27 @@ -53,6 +53,9 @@ Begin Project Dependency Project_Dep_Name icons End Project Dependency + Begin Project Dependency + Project_Dep_Name doc + End Project Dependency }}} ############################################################################### @@ -171,6 +174,18 @@ ############################################################################### +Project: "doc"=".\doc.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "fake_auth"=".\fake_auth\fake_auth.dsp" - Package Owner=<4> Package=<5> Index: squid/port/win32/squid_mswin.mak =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid_mswin.mak,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- squid/port/win32/squid_mswin.mak 23 Apr 2005 10:10:01 -0000 1.1.2.7 +++ squid/port/win32/squid_mswin.mak 1 May 2005 07:50:11 -0000 1.1.2.8 @@ -11,6 +11,7 @@ datadir = $(prefix)/share localstatedir = $(prefix)/var srcdir = ..\..\src +docdir = ..\..\doc win32includedir = .\include iconsdir = $(top_srcdir)\icons @@ -47,6 +48,13 @@ REPL_POLICIES = lru heap STORE_MODULES = ufs awin32 null +SUBSTITUTE=sed "\ + s%@DEFAULT_CONFIG_FILE@%$(DEFAULT_CONFIG_FILE)%g;\ + s%@DEFAULT_CACHEMGR_CONFIG@%$(DEFAULT_CACHEMGR_CONFIG)%g;\ + s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\ + s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\ + " + cf_gen_defines.h: $(srcdir)\cf_gen_defines $(srcdir)\cf.data.pre gawk -f $(srcdir)\cf_gen_defines <$(srcdir)\cf.data.pre >$(srcdir)\cf_gen_defines.h @@ -83,4 +91,9 @@ icons: .\icons.cmd $(iconsdir)\icons.shar .\icons.cmd $(iconsdir) - \ No newline at end of file + +squid.8: $(docdir)\squid.8.in .\$(THISMAKEFILE) + $(SUBSTITUTE) < $(docdir)\squid.8.in > $(docdir)\squid.8 + +cachemgr.cgi.8: $(docdir)\cachemgr.cgi.8.in .\$(THISMAKEFILE) + $(SUBSTITUTE) < $(docdir)\cachemgr.cgi.8.in > $(docdir)\cachemgr.cgi.8 Index: squid/port/win32/update.cmd =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/update.cmd,v retrieving revision 1.1.2.22 retrieving revision 1.1.2.23 diff -u -r1.1.2.22 -r1.1.2.23 --- squid/port/win32/update.cmd 23 Apr 2005 10:10:01 -0000 1.1.2.22 +++ squid/port/win32/update.cmd 1 May 2005 07:50:11 -0000 1.1.2.23 @@ -48,6 +48,7 @@ type %0\..\..\..\helpers\basic_auth\LDAP\squid_ldap_auth.8 | man2htm2 > %2\docs\squid_ldap_auth.html type %0\..\..\..\helpers\external_acl\LDAP_group\squid_ldap_group.8 | man2htm2 > %2\docs\squid_ldap_group.html type %0\..\..\..\doc\squid.8 | man2htm2 > %2\docs\squid.html +type %0\..\..\..\doc\cachemgr.cgi.8 | man2htm2 > %2\docs\cachemgr.cgi.html copy %0\..\..\..\README %2\README copy %0\..\..\..\COPYRIGHT %2\COPYRIGHT