--------------------- PatchSet 5766 Date: 2003/06/01 16:07:34 Author: serassio Branch: nt-2_5 Tag: (none) Log: Now the Squid version #define value for Visual Studio build environment is parsed from configure.in, non more need to define it statically in autoconf.h Members: port/win32/default_config_file.cmd:1.1.2.1->1.1.2.2 port/win32/modules.dsp:1.1.2.3->1.1.2.4 port/win32/include/autoconf.h:1.1.2.30->1.1.2.31 port/win32/include/autoconf.h.ssl:1.1.2.1->1.1.2.2 Index: squid/port/win32/default_config_file.cmd =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/default_config_file.cmd,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/default_config_file.cmd 27 Mar 2002 21:01:10 -0000 1.1.2.1 +++ squid/port/win32/default_config_file.cmd 1 Jun 2003 16:07:34 -0000 1.1.2.2 @@ -4,3 +4,7 @@ echo */ echo #define DEFAULT_CONFIG_FILE "%1" echo #define DEFAULT_SQUID_ERROR_DIR "%2" +echo /* Version number of package */ +rem FOR /F "tokens=1" %%i in ('grep AM_INIT_AUTOMAKE ..\..\configure.in | cut -f 2 -d "," | cut -f 1 -d ")"') do ( +FOR /F "usebackq tokens=2 delims=) " %%i in (`grep AM_INIT_AUTOMAKE ../../configure.in`) do echo #define VERSION "%%i" +) Index: squid/port/win32/modules.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/modules.dsp,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid/port/win32/modules.dsp 27 Mar 2002 21:01:10 -0000 1.1.2.3 +++ squid/port/win32/modules.dsp 1 Jun 2003 16:07:34 -0000 1.1.2.4 @@ -102,7 +102,7 @@ !IF "$(CFG)" == "modules - Win32 Release" -USERDEP__DEFAU="squid_mswin.mak" +USERDEP__DEFAU="squid_mswin.mak" "..\..\configure.in" # Begin Custom Build ProjDir=. InputPath=.\default_config_file.cmd @@ -114,7 +114,7 @@ !ELSEIF "$(CFG)" == "modules - Win32 Debug" -USERDEP__DEFAU="squid_mswin.mak" +USERDEP__DEFAU="squid_mswin.mak" "..\..\configure.in" # Begin Custom Build ProjDir=. InputPath=.\default_config_file.cmd Index: squid/port/win32/include/autoconf.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/autoconf.h,v retrieving revision 1.1.2.30 retrieving revision 1.1.2.31 diff -u -r1.1.2.30 -r1.1.2.31 --- squid/port/win32/include/autoconf.h 28 May 2003 10:44:37 -0000 1.1.2.30 +++ squid/port/win32/include/autoconf.h 1 Jun 2003 16:07:35 -0000 1.1.2.31 @@ -22,7 +22,7 @@ * */ -/* $Id: autoconf.h,v 1.1.2.30 2003/05/28 10:44:37 serassio Exp $ */ +/* $Id: autoconf.h,v 1.1.2.31 2003/06/01 16:07:35 serassio Exp $ */ /* * configure command line used to configure Squid @@ -906,9 +906,6 @@ /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Version number of package */ -#define VERSION "2.5.STABLE3-NT-CVS" - /* Define if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ /* #undef WORDS_BIGENDIAN */ Index: squid/port/win32/include/autoconf.h.ssl =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/autoconf.h.ssl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/include/autoconf.h.ssl 2 May 2003 13:01:25 -0000 1.1.2.1 +++ squid/port/win32/include/autoconf.h.ssl 1 Jun 2003 16:07:35 -0000 1.1.2.2 @@ -22,7 +22,7 @@ * */ -/* $Id: autoconf.h.ssl,v 1.1.2.1 2003/05/02 13:01:25 serassio Exp $ */ +/* $Id: autoconf.h.ssl,v 1.1.2.2 2003/06/01 16:07:35 serassio Exp $ */ /* * configure command line used to configure Squid @@ -911,9 +911,6 @@ /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Version number of package */ -#define VERSION "2.5.STABLE2.NT-CVS" - /* Define if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ /* #undef WORDS_BIGENDIAN */