---------------------
PatchSet 3315
Date: 2006/06/17 22:01:53
Author: serassio
Branch: nt
Tag: (none)
Log:
Updated Visual Studio Project
Members:
port/win32/default_config_file.cmd:1.2.18.4->1.2.18.5
port/win32/modules.vcproj:1.1.2.3->1.1.2.4
port/win32/squid_mswin.mak:1.2.18.6->1.2.18.7
port/win32/squid_version.cmd:1.1.2.2->1.1.2.3
port/win32/update.cmd:1.2.18.13->1.2.18.14
port/win32/cachemgr/cachemgr.vcproj:1.1.2.2->1.1.2.3
port/win32/cf_gen/cf_gen.vcproj:1.1.2.3->1.1.2.4
port/win32/include/autoconf.h:1.2.18.14->1.2.18.15
port/win32/libmiscutil/libmiscutil.vcproj:1.1.2.3->1.1.2.4
port/win32/squid/squid.vcproj:1.1.2.9->1.1.2.10
port/win32/squidclient/squidclient.vcproj:1.1.2.2->1.1.2.3
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.4
retrieving revision 1.2.18.5
diff -u -r1.2.18.4 -r1.2.18.5
--- squid3/port/win32/default_config_file.cmd 25 Apr 2006 14:14:12 -0000 1.2.18.4
+++ squid3/port/win32/default_config_file.cmd 17 Jun 2006 22:01:53 -0000 1.2.18.5
@@ -1,9 +1,9 @@
@echo off
-echo /* automatically generated by %0 %*
-echo * do not edit
+echo /* automatically generated by %0
+echo * do not edit manually
echo */
echo #define DEFAULT_CONFIG_FILE "%1"
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 "AC_INIT" ../../configure.in`) do echo #define VERSION "%%i"
+echo /* Info of package */
+FOR /F "tokens=1,2 delims== " %%a in (squid_version.mak) do echo #define %%a "%%b"
Index: squid3/port/win32/modules.vcproj
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/modules.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/modules.vcproj 30 Jan 2005 12:02:34 -0000 1.1.2.3
+++ squid3/port/win32/modules.vcproj 17 Jun 2006 22:01:53 -0000 1.1.2.4
@@ -21,7 +21,7 @@
IntermediateDirectory=".\."
ConfigurationType="10"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ ATLMinimizesCRunTimeLibraryUsage="false"
>
-
@@ -47,7 +44,7 @@
IntermediateDirectory=".\."
ConfigurationType="10"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ ATLMinimizesCRunTimeLibraryUsage="false"
>
-
@@ -127,7 +121,7 @@
>
@@ -137,7 +131,7 @@
>
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.6
retrieving revision 1.2.18.7
diff -u -r1.2.18.6 -r1.2.18.7
--- squid3/port/win32/squid_mswin.mak 12 Nov 2005 13:01:34 -0000 1.2.18.6
+++ squid3/port/win32/squid_mswin.mak 17 Jun 2006 22:01:53 -0000 1.2.18.7
@@ -54,6 +54,7 @@
s%@DEFAULT_CACHEMGR_CONFIG@%$(DEFAULT_CACHEMGR_CONFIG)%g;\
s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\
s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
+ s%@PACKAGE_STRING@%$(PACKAGE_STRING)%g;\
"
cf_gen_defines.h: $(srcdir)\cf_gen_defines $(srcdir)\cf.data.pre
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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- squid3/port/win32/squid_version.cmd 25 Apr 2006 14:14:12 -0000 1.1.2.2
+++ squid3/port/win32/squid_version.cmd 17 Jun 2006 22:01:53 -0000 1.1.2.3
@@ -1,2 +1,12 @@
@echo off
-FOR /F "usebackq skip=2 tokens=2 delims=) " %%i in (`find "AC_INIT" ../../configure.in`) do echo VERSION = %%i
+FOR /F "usebackq skip=2 tokens=2 delims=,(" %%i in (`find "AC_INIT" ../../configure.in`) do set PACKAGE_NAME=%%i
+FOR /F "usebackq skip=2 tokens=4 delims=, " %%i in (`find "AC_INIT" ../../configure.in`) do set PACKAGE_VERSION=%%i
+FOR /F "usebackq skip=2 tokens=5 delims=, " %%i in (`find "AC_INIT" ../../configure.in`) do set PACKAGE_BUGREPORT=%%i
+FOR /F "usebackq skip=2 tokens=6 delims=), " %%i in (`find "AC_INIT" ../../configure.in`) do set PACKAGE_TARNAME=%%i
+echo PACKAGE_NAME = %PACKAGE_NAME%
+echo PACKAGE_TARNAME = %PACKAGE_TARNAME%
+echo PACKAGE_VERSION = %PACKAGE_VERSION%
+echo PACKAGE_STRING = %PACKAGE_NAME% %PACKAGE_VERSION%
+echo PACKAGE_BUGREPORT = %PACKAGE_BUGREPORT%
+echo PACKAGE = %PACKAGE_TARNAME%
+echo VERSION = %PACKAGE_VERSION%
Index: squid3/port/win32/update.cmd
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/update.cmd,v
retrieving revision 1.2.18.13
retrieving revision 1.2.18.14
diff -u -r1.2.18.13 -r1.2.18.14
--- squid3/port/win32/update.cmd 25 Apr 2006 14:14:12 -0000 1.2.18.13
+++ squid3/port/win32/update.cmd 17 Jun 2006 22:01:53 -0000 1.2.18.14
@@ -8,8 +8,7 @@
if not exist %2\docs md %2\docs
if not exist %2\etc md %2\etc
if not exist %2\var\logs md %2\var\logs
-if not exist %2\share\errors\english md %2\share\errors\english
-if not exist %2\share\errors\italian md %2\share\errors\italian
+if not exist %2\share\errors md %2\share\errors
if not exist %2\share\icons md %2\share\icons
copy %0\..\squid\%1\squid.exe %2\sbin\squid.exe
@@ -35,8 +34,9 @@
copy %0\..\..\..\src\cachemgr.conf %2\etc\cachemgr.conf.default
copy %0\..\..\..\src\mib.txt %2\share\mib.txt
-copy %0\..\..\..\errors\english\err_* %2\share\errors\english > NUL
-copy %0\..\..\..\errors\italian\err_* %2\share\errors\italian > NUL
+pushd %0\..\..\..\errors
+for /D %%d IN (*) DO xcopy /Y /Q %%d\err_* %2\share\errors\%%d\
+popd
copy %0\..\..\..\icons\*.gif %2\share\icons > NUL
Index: squid3/port/win32/cachemgr/cachemgr.vcproj
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/cachemgr/Attic/cachemgr.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/cachemgr/cachemgr.vcproj 1 Jan 2005 11:14:51 -0000 1.1.2.2
+++ squid3/port/win32/cachemgr/cachemgr.vcproj 17 Jun 2006 22:01:53 -0000 1.1.2.3
@@ -19,7 +19,7 @@
IntermediateDirectory=".\Debug"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
+
+
Index: squid3/port/win32/cf_gen/cf_gen.vcproj
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/cf_gen/Attic/cf_gen.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/cf_gen/cf_gen.vcproj 6 Nov 2005 11:23:58 -0000 1.1.2.3
+++ squid3/port/win32/cf_gen/cf_gen.vcproj 17 Jun 2006 22:01:53 -0000 1.1.2.4
@@ -216,6 +216,10 @@
RelativePath="..\..\..\src\globals.cc"
>
+
+
+
+
+
+
@@ -680,6 +684,10 @@
>
+
+
@@ -696,6 +704,10 @@
>
+
+
@@ -807,6 +819,18 @@
>
+
+
+
+
+
+
Index: squid3/port/win32/squidclient/squidclient.vcproj
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/squidclient/Attic/squidclient.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/squidclient/squidclient.vcproj 1 Jan 2005 11:14:57 -0000 1.1.2.2
+++ squid3/port/win32/squidclient/squidclient.vcproj 17 Jun 2006 22:01:54 -0000 1.1.2.3
@@ -19,7 +19,7 @@
IntermediateDirectory=".\Release"
ConfigurationType="1"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
+
+