---------------------
PatchSet 2120 
Date: 2005/11/06 16:12:18
Author: serassio
Branch: nt
Tag: (none) 
Log:
Updated VisualStudio Project

Members: 
	port/win32/Makefile.am:1.2.18.14->1.2.18.15 
	port/win32/doc.vcproj:1.1->1.1.2.1 
	port/win32/icons.cmd:1.2.18.1->1.2.18.2 
	port/win32/icons.vcproj:1.1.2.3->1.1.2.4 
	port/win32/squid.sln:1.1.2.4->1.1.2.5 
	port/win32/squid_mswin.mak:1.2.18.4->1.2.18.5 
	port/win32/update.cmd:1.2.18.10->1.2.18.11 

Index: squid3/port/win32/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/Makefile.am,v
retrieving revision 1.2.18.14
retrieving revision 1.2.18.15
diff -u -r1.2.18.14 -r1.2.18.15
--- squid3/port/win32/Makefile.am	1 Nov 2005 20:54:19 -0000	1.2.18.14
+++ squid3/port/win32/Makefile.am	6 Nov 2005 16:12:18 -0000	1.2.18.15
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-# $Id: Makefile.am,v 1.2.18.14 2005/11/01 20:54:19 serassio Exp $
+# $Id: Makefile.am,v 1.2.18.15 2005/11/06 16:12:18 serassio Exp $
 #
 
 EXTRA_DIST = \
@@ -8,6 +8,7 @@
 	cf_data.vcproj \
 	default_config_file.cmd \
 	digest_pw_auth/digest_pw_auth.vcproj \
+	doc.vcproj \
 	icons.vcproj \
 	install.vcproj \
 	modules.vcproj \
--- /dev/null	Wed Feb 14 13:33:00 2007
+++ squid3/port/win32/doc.vcproj	Wed Feb 14 13:35:33 2007
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="doc"
+	ProjectGUID="{68527517-5E82-4A59-861F-F8342237DE18}"
+	RootNamespace="doc"
+	Keyword="MakeFileProj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
+			BuildLogFile="$(SolutionDir)\BuildLog.htm"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
+			BuildLogFile="$(SolutionDir)\BuildLog.htm"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\..\doc\cachemgr.cgi.8.in"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					CommandLine="nmake /f $(SolutionDir)squid_mswin.mak cachemgr.cgi.8&#x0D;&#x0A;"
+					AdditionalDependencies="$(SolutionDir)squid_mswin.mak"
+					Outputs="$(InputDir)cachemgr.cgi.8"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					CommandLine="nmake /f $(SolutionDir)squid_mswin.mak cachemgr.cgi.8&#x0D;&#x0A;"
+					AdditionalDependencies="$(SolutionDir)squid_mswin.mak"
+					Outputs="$(InputDir)cachemgr.cgi.8"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\doc\squid.8.in"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					CommandLine="nmake /f $(SolutionDir)squid_mswin.mak squid.8&#x0D;&#x0A;"
+					AdditionalDependencies="$(SolutionDir)squid_mswin.mak"
+					Outputs="$(InputDir)squid.8"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					CommandLine="nmake /f $(SolutionDir)squid_mswin.mak squid.8&#x0D;&#x0A;"
+					AdditionalDependencies="$(SolutionDir)squid_mswin.mak"
+					Outputs="$(InputDir)squid.8"
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
Index: squid3/port/win32/icons.cmd
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/icons.cmd,v
retrieving revision 1.2.18.1
retrieving revision 1.2.18.2
diff -u -r1.2.18.1 -r1.2.18.2
--- squid3/port/win32/icons.cmd	25 Feb 2003 02:48:35 -0000	1.2.18.1
+++ squid3/port/win32/icons.cmd	6 Nov 2005 16:12:18 -0000	1.2.18.2
@@ -1,4 +1,6 @@
 @echo off
 cd /D %1
+attrib -r *.gif >NUL 2>&1
+del *.gif >NUL 2>&1
 sh icons.shar
-attrib -r *.gif
+attrib -r *.gif >NUL 2>&1
Index: squid3/port/win32/icons.vcproj
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/icons.vcproj,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- squid3/port/win32/icons.vcproj	30 Jan 2005 12:02:34 -0000	1.1.2.3
+++ squid3/port/win32/icons.vcproj	6 Nov 2005 16:12:18 -0000	1.1.2.4
@@ -21,7 +21,8 @@
 			IntermediateDirectory=".\."
 			ConfigurationType="10"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			DeleteExtensionsOnClean="$(outdir)\*.gif"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -35,9 +36,6 @@
 				HeaderFileName=""
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -47,7 +45,8 @@
 			IntermediateDirectory=".\."
 			ConfigurationType="10"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			DeleteExtensionsOnClean="$(outdir)\*.gif"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -61,9 +60,6 @@
 				HeaderFileName=""
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
Index: squid3/port/win32/squid.sln
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/squid.sln,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- squid3/port/win32/squid.sln	1 Nov 2005 20:54:19 -0000	1.1.2.4
+++ squid3/port/win32/squid.sln	6 Nov 2005 16:12:18 -0000	1.1.2.5
@@ -3,6 +3,8 @@
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Build", "Build.vcproj", "{C50A62CE-A509-4D92-BB2D-B6AC10F29679}"
 	ProjectSection(ProjectDependencies) = postProject
+		{86E28700-5F2A-4181-A6F7-13B739E434B7} = {86E28700-5F2A-4181-A6F7-13B739E434B7}
+		{68527517-5E82-4A59-861F-F8342237DE18} = {68527517-5E82-4A59-861F-F8342237DE18}
 		{E9AE84F6-5932-40EA-9EFF-B9553993258E} = {E9AE84F6-5932-40EA-9EFF-B9553993258E}
 		{FEBC1AD4-8805-490F-86C4-EED32F9D364C} = {FEBC1AD4-8805-490F-86C4-EED32F9D364C}
 		{436115CB-6D55-48CA-9625-484F9DAE7F7E} = {436115CB-6D55-48CA-9625-484F9DAE7F7E}
@@ -17,7 +19,6 @@
 		{B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18} = {B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18}
 		{236A1219-0E12-4A5D-AB03-C1680A665F05} = {236A1219-0E12-4A5D-AB03-C1680A665F05}
 		{5A3E6817-5A3C-4F59-BC8B-5365A50D2780} = {5A3E6817-5A3C-4F59-BC8B-5365A50D2780}
-		{86E28700-5F2A-4181-A6F7-13B739E434B7} = {86E28700-5F2A-4181-A6F7-13B739E434B7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LDAP_auth", "LDAP_auth\LDAP_auth.vcproj", "{FEBC1AD4-8805-490F-86C4-EED32F9D364C}"
@@ -226,6 +227,8 @@
 		{89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc", "doc.vcproj", "{68527517-5E82-4A59-861F-F8342237DE18}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -408,6 +411,10 @@
 		{0A05ED5C-CAA9-4753-B70D-7A443099572F}.Debug|Win32.Build.0 = Debug|Win32
 		{0A05ED5C-CAA9-4753-B70D-7A443099572F}.Release|Win32.ActiveCfg = Release|Win32
 		{0A05ED5C-CAA9-4753-B70D-7A443099572F}.Release|Win32.Build.0 = Release|Win32
+		{68527517-5E82-4A59-861F-F8342237DE18}.Debug|Win32.ActiveCfg = Debug|Win32
+		{68527517-5E82-4A59-861F-F8342237DE18}.Debug|Win32.Build.0 = Debug|Win32
+		{68527517-5E82-4A59-861F-F8342237DE18}.Release|Win32.ActiveCfg = Release|Win32
+		{68527517-5E82-4A59-861F-F8342237DE18}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
Index: squid3/port/win32/squid_mswin.mak
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/squid_mswin.mak,v
retrieving revision 1.2.18.4
retrieving revision 1.2.18.5
diff -u -r1.2.18.4 -r1.2.18.5
--- squid3/port/win32/squid_mswin.mak	25 Apr 2005 12:13:54 -0000	1.2.18.4
+++ squid3/port/win32/squid_mswin.mak	6 Nov 2005 16:12:18 -0000	1.2.18.5
@@ -11,6 +11,7 @@
 datadir		= $(prefix)/share
 localstatedir   = $(prefix)/var
 srcdir		= ..\..\src
+docdir		= ..\..\doc
 win32includedir = .\include
 iconsdir		= $(top_srcdir)\icons
 
@@ -46,6 +47,13 @@
 
 REPL_POLICIES = lru heap
 
+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
 
@@ -77,3 +85,9 @@
 	
 icons: .\icons.cmd $(iconsdir)\icons.shar
 	.\icons.cmd $(iconsdir)
+
+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: squid3/port/win32/update.cmd
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/update.cmd,v
retrieving revision 1.2.18.10
retrieving revision 1.2.18.11
diff -u -r1.2.18.10 -r1.2.18.11
--- squid3/port/win32/update.cmd	1 Nov 2005 20:54:19 -0000	1.2.18.10
+++ squid3/port/win32/update.cmd	6 Nov 2005 16:12:18 -0000	1.2.18.11
@@ -37,10 +37,11 @@
 
 copy %0\..\..\..\icons\*.gif %2\share\icons > NUL
 
-copy %0\..\..\..\helpers\ntlm_auth\NTLMSSP-WIN32\readme.txt %2\docs\win32_ntlm_auth.txt
-copy %0\..\..\..\helpers\external_acl\win32_group\readme.txt %2\docs\win32_check_group.txt
+copy %0\..\..\..\helpers\ntlm_auth\mswin_sspi\readme.txt %2\docs\mswin_ntlm_auth.txt
+copy %0\..\..\..\helpers\negotiate_auth\mswin_sspi\readme.txt %2\docs\mswin_negotiate_auth.txt
+copy %0\..\..\..\helpers\external_acl\mswin_lm_group\readme.txt %2\docs\mswin_check_lm_group.txt
 copy %0\..\..\..\helpers\external_acl\ip_user\README %2\docs\ip_user_check.txt
-copy %0\..\..\..\helpers\basic_auth\win32_locallogon\readme.txt %2\docs\nt_auth.txt
+copy %0\..\..\..\helpers\basic_auth\mswin_sspi\readme.txt %2\docs\mswin_auth.txt
 copy %0\..\..\..\doc\win32-relnotes.html %2\docs\win32-relnotes.html
 copy %0\..\..\..\doc\debug-sections.txt %2\docs\debug-sections.txt
 copy %0\..\..\..\doc\HTTP-codes.txt %2\docs\HTTP-codes.txt
@@ -49,6 +50,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