---------------------
PatchSet 2893
Date: 2006/04/25 14:14:12
Author: serassio
Branch: nt
Tag: (none)
Log:
Updated VisualStudio 2005 Project
Members:
port/win32/Makefile.am:1.2.18.17->1.2.18.18
port/win32/PerlPreprocessing.vcproj:1.1.2.2->1.1.2.3
port/win32/default_config_file.cmd:1.2.18.3->1.2.18.4
port/win32/squid.sln:1.1.2.6->1.1.2.7
port/win32/squid_version.cmd:1.1.2.1->1.1.2.2
port/win32/update.cmd:1.2.18.12->1.2.18.13
port/win32/digest_ldap_auth/.cvsignore:1.1->1.1.2.1
port/win32/digest_ldap_auth/digest_ldap_auth.vcproj:1.1->1.1.2.1
port/win32/digest_pw_auth/digest_pw_auth.vcproj:1.1.2.1->1.1.2.2
port/win32/libc/libc.vcproj:1.1.2.2->1.1.2.3
port/win32/squid/squid.vcproj:1.1.2.7->1.1.2.8
Index: squid3/port/win32/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/Makefile.am,v
retrieving revision 1.2.18.17
retrieving revision 1.2.18.18
diff -u -r1.2.18.17 -r1.2.18.18
--- squid3/port/win32/Makefile.am 4 Dec 2005 10:59:57 -0000 1.2.18.17
+++ squid3/port/win32/Makefile.am 25 Apr 2006 14:14:12 -0000 1.2.18.18
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
#
-# $Id: Makefile.am,v 1.2.18.17 2005/12/04 10:59:57 serassio Exp $
+# $Id: Makefile.am,v 1.2.18.18 2006/04/25 14:14:12 serassio Exp $
#
EXTRA_DIST = \
@@ -8,6 +8,7 @@
cf_data.vcproj \
default_config_file.cmd \
digest_pw_auth/digest_pw_auth.vcproj \
+ digest_ldap_auth/digest_ldap_auth.vcproj \
doc.vcproj \
icons.vcproj \
install.vcproj \
Index: squid3/port/win32/PerlPreprocessing.vcproj
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/PerlPreprocessing.vcproj,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- squid3/port/win32/PerlPreprocessing.vcproj 1 Jan 2005 11:14:50 -0000 1.1.2.2
+++ squid3/port/win32/PerlPreprocessing.vcproj 25 Apr 2006 14:14:12 -0000 1.1.2.3
@@ -20,7 +20,7 @@
IntermediateDirectory=".\."
ConfigurationType="10"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ ATLMinimizesCRunTimeLibraryUsage="false"
>
-
@@ -46,7 +43,7 @@
IntermediateDirectory=".\."
ConfigurationType="10"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ ATLMinimizesCRunTimeLibraryUsage="false"
>
-
@@ -100,7 +94,7 @@
>
@@ -109,7 +103,7 @@
>
Index: squid3/port/win32/default_config_file.cmd
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/default_config_file.cmd,v
retrieving revision 1.2.18.3
retrieving revision 1.2.18.4
diff -u -r1.2.18.3 -r1.2.18.4
--- squid3/port/win32/default_config_file.cmd 25 Apr 2005 12:13:54 -0000 1.2.18.3
+++ squid3/port/win32/default_config_file.cmd 25 Apr 2006 14:14:12 -0000 1.2.18.4
@@ -6,4 +6,4 @@
echo #define DEFAULT_SQUID_ERROR_DIR "%2"
echo #define DEFAULT_CACHEMGR_CONFIG "%3"
echo /* Version number of package */
-FOR /F "usebackq skip=2 tokens=2 delims=) " %%i in (`find "AM_INIT_AUTOMAKE" ../../configure.in`) do echo #define VERSION "%%i"
+FOR /F "usebackq skip=2 tokens=2 delims=) " %%i in (`find "AC_INIT" ../../configure.in`) do echo #define VERSION "%%i"
Index: squid3/port/win32/squid.sln
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/squid.sln,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- squid3/port/win32/squid.sln 4 Dec 2005 10:59:57 -0000 1.1.2.6
+++ squid3/port/win32/squid.sln 25 Apr 2006 14:14:12 -0000 1.1.2.7
@@ -3,6 +3,10 @@
# 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}
+ {5A3E6817-5A3C-4F59-BC8B-5365A50D2780} = {5A3E6817-5A3C-4F59-BC8B-5365A50D2780}
+ {A42166DB-7B36-4757-9987-20630AF9A15A} = {A42166DB-7B36-4757-9987-20630AF9A15A}
+ {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38} = {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38}
{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,8 +21,6 @@
{B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18} = {B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18}
{236A1219-0E12-4A5D-AB03-C1680A665F05} = {236A1219-0E12-4A5D-AB03-C1680A665F05}
{68527517-5E82-4A59-861F-F8342237DE18} = {68527517-5E82-4A59-861F-F8342237DE18}
- {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}"
@@ -44,6 +46,9 @@
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cf_data", "cf_data.vcproj", "{0DFA8E93-CD7B-42DF-9BB5-1BB51B55B587}"
+ ProjectSection(ProjectDependencies) = postProject
+ {E665C76C-411C-40B2-BF0A-12E61DFFF0B7} = {E665C76C-411C-40B2-BF0A-12E61DFFF0B7}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cf_gen", "cf_gen\cf_gen.vcproj", "{426670FC-0606-4959-B3FA-2A0EC2264E91}"
ProjectSection(ProjectDependencies) = postProject
@@ -148,8 +153,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squid", "squid\squid.vcproj", "{C3ACE9B0-9E43-4CCB-8642-8F66F55DAEDD}"
ProjectSection(ProjectDependencies) = postProject
- {8C9E4410-64C5-471D-A4E2-11CDD1E56527} = {8C9E4410-64C5-471D-A4E2-11CDD1E56527}
- {93345CCC-5234-4178-916D-A8034D05E0EF} = {93345CCC-5234-4178-916D-A8034D05E0EF}
{FF99A1FE-532A-4A23-AD40-AEEE8E9BB05F} = {FF99A1FE-532A-4A23-AD40-AEEE8E9BB05F}
{BE74C2FC-B559-43E3-BE83-F1700D5E267D} = {BE74C2FC-B559-43E3-BE83-F1700D5E267D}
{E73379FA-E241-43B2-B83F-2378EBBDD24F} = {E73379FA-E241-43B2-B83F-2378EBBDD24F}
@@ -160,6 +163,7 @@
{303568DA-FD43-4B0B-8D7E-090BC9350A64} = {303568DA-FD43-4B0B-8D7E-090BC9350A64}
{AB5858D1-01C2-43A6-9665-2ACC4CB37052} = {AB5858D1-01C2-43A6-9665-2ACC4CB37052}
{89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243}
+ {93345CCC-5234-4178-916D-A8034D05E0EF} = {93345CCC-5234-4178-916D-A8034D05E0EF}
{CF8BFAAD-1BB1-497F-A6B0-75739AF88FE8} = {CF8BFAAD-1BB1-497F-A6B0-75739AF88FE8}
{AB5656AD-FBB4-4836-8E38-385FCE92780B} = {AB5656AD-FBB4-4836-8E38-385FCE92780B}
{2BCD20AD-A8F3-4E68-9282-9ABAD020042F} = {2BCD20AD-A8F3-4E68-9282-9ABAD020042F}
@@ -171,6 +175,7 @@
{AEF9372C-F983-4104-9EC3-345C9693E66B} = {AEF9372C-F983-4104-9EC3-345C9693E66B}
{D699E422-95DC-448E-8338-9AF3E0DD5BFB} = {D699E422-95DC-448E-8338-9AF3E0DD5BFB}
{5FAC2F21-D34C-46F3-8356-5D28C1136D4C} = {5FAC2F21-D34C-46F3-8356-5D28C1136D4C}
+ {8C9E4410-64C5-471D-A4E2-11CDD1E56527} = {8C9E4410-64C5-471D-A4E2-11CDD1E56527}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squid_conf_default", "squid_conf_default.vcproj", "{DB51CEDA-D745-45BB-941F-40740526AA36}"
@@ -232,6 +237,11 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libicap", "libicap\libicap.vcproj", "{93345CCC-5234-4178-916D-A8034D05E0EF}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "digest_ldap_auth", "digest_ldap_auth\digest_ldap_auth.vcproj", "{DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38}"
+ ProjectSection(ProjectDependencies) = postProject
+ {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -422,6 +432,10 @@
{93345CCC-5234-4178-916D-A8034D05E0EF}.Debug|Win32.Build.0 = Debug|Win32
{93345CCC-5234-4178-916D-A8034D05E0EF}.Release|Win32.ActiveCfg = Release|Win32
{93345CCC-5234-4178-916D-A8034D05E0EF}.Release|Win32.Build.0 = Release|Win32
+ {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38}.Debug|Win32.Build.0 = Debug|Win32
+ {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38}.Release|Win32.ActiveCfg = Release|Win32
+ {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Index: squid3/port/win32/squid_version.cmd
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/squid_version.cmd,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid3/port/win32/squid_version.cmd 30 Jan 2005 12:02:34 -0000 1.1.2.1
+++ squid3/port/win32/squid_version.cmd 25 Apr 2006 14:14:12 -0000 1.1.2.2
@@ -1,2 +1,2 @@
@echo off
-FOR /F "usebackq skip=2 tokens=2 delims=) " %%i in (`find "AM_INIT_AUTOMAKE" ../../configure.in`) do echo VERSION = %%i
+FOR /F "usebackq skip=2 tokens=2 delims=) " %%i in (`find "AC_INIT" ../../configure.in`) do echo VERSION = %%i
Index: squid3/port/win32/update.cmd
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/update.cmd,v
retrieving revision 1.2.18.12
retrieving revision 1.2.18.13
diff -u -r1.2.18.12 -r1.2.18.13
--- squid3/port/win32/update.cmd 8 Nov 2005 15:23:35 -0000 1.2.18.12
+++ squid3/port/win32/update.cmd 25 Apr 2006 14:14:12 -0000 1.2.18.13
@@ -26,6 +26,8 @@
copy %0\..\ldap_group\%1\ldap_group.exe %2\libexec\squid_ldap_group.exe
copy %0\..\mswin_check_lm_group\%1\mswin_check_lm_group.exe %2\libexec\mswin_check_lm_group.exe
copy %0\..\ip_user_check\%1\ip_user_check.exe %2\libexec\ip_user_check.exe
+copy %0\..\digest_ldap_auth\%1\digest_ldap_auth.exe %2\libexec\digest_ldap_auth.exe
+copy %0\..\digest_pw_auth\%1\digest_pw_auth.exe %2\libexec\digest_pw_auth.exe
copy %0\..\cachemgr\%1\cachemgr.exe %2\libexec\cachemgr.cgi
copy %0\..\..\..\src\squid.conf.default %2\etc\squid.conf.default
--- /dev/null Wed Feb 14 13:33:00 2007
+++ squid3/port/win32/digest_ldap_auth/.cvsignore Wed Feb 14 13:36:31 2007
@@ -0,0 +1,3 @@
+*.user
+Debug
+Release
--- /dev/null Wed Feb 14 13:33:00 2007
+++ squid3/port/win32/digest_ldap_auth/digest_ldap_auth.vcproj Wed Feb 14 13:36:31 2007
@@ -0,0 +1,215 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: squid3/port/win32/digest_pw_auth/digest_pw_auth.vcproj
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/digest_pw_auth/Attic/digest_pw_auth.vcproj,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid3/port/win32/digest_pw_auth/digest_pw_auth.vcproj 22 May 2005 07:57:31 -0000 1.1.2.1
+++ squid3/port/win32/digest_pw_auth/digest_pw_auth.vcproj 25 Apr 2006 14:14:12 -0000 1.1.2.2
@@ -61,7 +61,7 @@
/>
-
-
Index: squid3/port/win32/libc/libc.vcproj
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/libc/Attic/libc.vcproj,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- squid3/port/win32/libc/libc.vcproj 1 Jan 2005 11:14:54 -0000 1.1.2.2
+++ squid3/port/win32/libc/libc.vcproj 25 Apr 2006 14:14:12 -0000 1.1.2.3
@@ -19,7 +19,7 @@
IntermediateDirectory=".\Debug"
ConfigurationType="4"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
Index: squid3/port/win32/squid/squid.vcproj
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/squid/Attic/squid.vcproj,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- squid3/port/win32/squid/squid.vcproj 1 Nov 2005 20:54:19 -0000 1.1.2.7
+++ squid3/port/win32/squid/squid.vcproj 25 Apr 2006 14:14:12 -0000 1.1.2.8
@@ -216,6 +216,10 @@
>
+
+
@@ -280,6 +284,10 @@
>
+
+
@@ -296,6 +304,10 @@
>
+
+
@@ -552,6 +564,10 @@
>
+
+
@@ -703,6 +719,10 @@
RelativePath="..\..\..\src\win32.cc"
>
+
+
@@ -787,6 +807,10 @@
>
+
+