--------------------- PatchSet 8116 Date: 2006/06/02 11:57:46 Author: serassio Branch: nt Tag: (none) Log: Derive all package version/info automatically from configure Members: port/win32/.cvsignore:1.1.32.1->1.1.32.2 port/win32/Makefile.am:1.1.14.2->1.1.14.3 port/win32/default_config_file.cmd:1.1.36.2->1.1.36.3 port/win32/doc.dsp:1.1.10.1->1.1.10.2 port/win32/modules.dsp:1.1.38.1->1.1.38.2 port/win32/squid.dsw:1.1.38.3->1.1.38.4 port/win32/squid_mswin.mak:1.1.38.1->1.1.38.2 port/win32/squid_version.cmd:1.1->1.1.2.1 port/win32/include/autoconf.h:1.1.38.4->1.1.38.5 Index: squid/port/win32/.cvsignore =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/.cvsignore,v retrieving revision 1.1.32.1 retrieving revision 1.1.32.2 diff -u -r1.1.32.1 -r1.1.32.2 --- squid/port/win32/.cvsignore 16 May 2006 21:05:58 -0000 1.1.32.1 +++ squid/port/win32/.cvsignore 2 Jun 2006 11:57:46 -0000 1.1.32.2 @@ -1,4 +1,4 @@ -.cvsignore Debug Release Makefile.in +squid_version.mak \ No newline at end of file Index: squid/port/win32/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/Makefile.am,v retrieving revision 1.1.14.2 retrieving revision 1.1.14.3 diff -u -r1.1.14.2 -r1.1.14.3 --- squid/port/win32/Makefile.am 23 May 2006 10:58:22 -0000 1.1.14.2 +++ squid/port/win32/Makefile.am 2 Jun 2006 11:57:46 -0000 1.1.14.3 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in # -# $Id: Makefile.am,v 1.1.14.2 2006/05/23 10:58:22 serassio Exp $ +# $Id: Makefile.am,v 1.1.14.3 2006/06/02 11:57:46 serassio Exp $ # EXTRA_DIST = \ @@ -18,6 +18,7 @@ squid.dsw \ squid_conf_default.dsp \ squid_mswin.mak \ + squid_version.cmd \ store_modules.cmd \ update.cmd \ cachemgr/cachemgr.dsp \ 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.36.2 retrieving revision 1.1.36.3 diff -u -r1.1.36.2 -r1.1.36.3 --- squid/port/win32/default_config_file.cmd 30 May 2006 20:16:20 -0000 1.1.36.2 +++ squid/port/win32/default_config_file.cmd 2 Jun 2006 11:57:46 -0000 1.1.36.3 @@ -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: squid/port/win32/doc.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/doc.dsp,v retrieving revision 1.1.10.1 retrieving revision 1.1.10.2 diff -u -r1.1.10.1 -r1.1.10.2 --- squid/port/win32/doc.dsp 16 May 2006 21:05:58 -0000 1.1.10.1 +++ squid/port/win32/doc.dsp 2 Jun 2006 11:57:46 -0000 1.1.10.2 @@ -66,9 +66,9 @@ !IF "$(CFG)" == "doc - Win32 Release" # PROP Ignore_Default_Tool 1 -USERDEP__CACHE="squid_mswin.mak" +USERDEP__CACHE="squid_mswin.mak" "squid_version.mak" # Begin Custom Build -InputDir=\work\nt-2.5\doc +InputDir=\work\nt-2.6\doc ProjDir=. InputPath=..\..\doc\cachemgr.cgi.8.in @@ -80,9 +80,9 @@ !ELSEIF "$(CFG)" == "doc - Win32 Debug" # PROP Ignore_Default_Tool 1 -USERDEP__CACHE="squid_mswin.mak" +USERDEP__CACHE="squid_mswin.mak" "squid_version.mak" # Begin Custom Build -InputDir=\work\nt-2.5\doc +InputDir=\work\nt-2.6\doc ProjDir=. InputPath=..\..\doc\cachemgr.cgi.8.in @@ -101,9 +101,9 @@ !IF "$(CFG)" == "doc - Win32 Release" # PROP Ignore_Default_Tool 1 -USERDEP__SQUID="squid_mswin.mak" +USERDEP__SQUID="squid_mswin.mak" "squid_version.mak" # Begin Custom Build -InputDir=\work\nt-2.5\doc +InputDir=\work\nt-2.6\doc ProjDir=. InputPath=..\..\doc\squid.8.in @@ -115,9 +115,9 @@ !ELSEIF "$(CFG)" == "doc - Win32 Debug" # PROP Ignore_Default_Tool 1 -USERDEP__SQUID="squid_mswin.mak" +USERDEP__SQUID="squid_mswin.mak" "squid_version.mak" # Begin Custom Build -InputDir=\work\nt-2.5\doc +InputDir=\work\nt-2.6\doc ProjDir=. InputPath=..\..\doc\squid.8.in Index: squid/port/win32/modules.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/modules.dsp,v retrieving revision 1.1.38.1 retrieving revision 1.1.38.2 diff -u -r1.1.38.1 -r1.1.38.2 --- squid/port/win32/modules.dsp 16 May 2006 21:05:58 -0000 1.1.38.1 +++ squid/port/win32/modules.dsp 2 Jun 2006 11:57:46 -0000 1.1.38.2 @@ -67,7 +67,7 @@ # PROP Intermediate_Dir "." # PROP Ignore_Default_Tool 1 -USERDEP__AUTH_="squid_mswin.mak" +USERDEP__AUTH_="squid_version.mak" "squid_mswin.mak" # Begin Custom Build OutDir=.\..\..\src ProjDir=. @@ -82,7 +82,7 @@ # PROP Intermediate_Dir "." # PROP Ignore_Default_Tool 1 -USERDEP__AUTH_="squid_mswin.mak" +USERDEP__AUTH_="squid_version.mak" "squid_mswin.mak" # Begin Custom Build OutDir=.\..\..\src ProjDir=. @@ -102,7 +102,8 @@ !IF "$(CFG)" == "modules - Win32 Release" -USERDEP__DEFAU="squid_mswin.mak" "..\..\configure.in" +# PROP Ignore_Default_Tool 1 +USERDEP__DEFAU="squid_version.mak" "squid_mswin.mak" # Begin Custom Build ProjDir=. InputPath=.\default_config_file.cmd @@ -114,7 +115,8 @@ !ELSEIF "$(CFG)" == "modules - Win32 Debug" -USERDEP__DEFAU="squid_mswin.mak" "..\..\configure.in" +# PROP Ignore_Default_Tool 1 +USERDEP__DEFAU="squid_version.mak" "squid_mswin.mak" # Begin Custom Build ProjDir=. InputPath=.\default_config_file.cmd @@ -135,7 +137,7 @@ # PROP Intermediate_Dir "." # PROP Ignore_Default_Tool 1 -USERDEP__REPL_="squid_mswin.mak" +USERDEP__REPL_="squid_version.mak" "squid_mswin.mak" # Begin Custom Build OutDir=.\..\..\src ProjDir=. @@ -150,7 +152,7 @@ # PROP Intermediate_Dir "." # PROP Ignore_Default_Tool 1 -USERDEP__REPL_="squid_mswin.mak" +USERDEP__REPL_="squid_version.mak" "squid_mswin.mak" # Begin Custom Build OutDir=.\..\..\src ProjDir=. @@ -166,13 +168,46 @@ # End Source File # Begin Source File +SOURCE=.\squid_version.cmd + +!IF "$(CFG)" == "modules - Win32 Release" + +# PROP Ignore_Default_Tool 1 +USERDEP__SQUID="..\..\configure.in" "squid_mswin.mak" +# Begin Custom Build +ProjDir=. +InputPath=.\squid_version.cmd + +"$(ProjDir)\squid_version.mak" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(ProjDir)\squid_version.cmd > $(ProjDir)\squid_version.mak + +# End Custom Build + +!ELSEIF "$(CFG)" == "modules - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +USERDEP__SQUID="..\..\configure.in" "squid_mswin.mak" +# Begin Custom Build +ProjDir=. +InputPath=.\squid_version.cmd + +"$(ProjDir)\squid_version.mak" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(ProjDir)\squid_version.cmd > $(ProjDir)\squid_version.mak + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\store_modules.cmd !IF "$(CFG)" == "modules - Win32 Release" # PROP Intermediate_Dir "." # PROP Ignore_Default_Tool 1 -USERDEP__STORE="squid_mswin.mak" +USERDEP__STORE="squid_version.mak" "squid_mswin.mak" # Begin Custom Build OutDir=.\..\..\src ProjDir=. @@ -187,7 +222,7 @@ # PROP Intermediate_Dir "." # PROP Ignore_Default_Tool 1 -USERDEP__STORE="squid_mswin.mak" +USERDEP__STORE="squid_version.mak" "squid_mswin.mak" # Begin Custom Build OutDir=.\..\..\src ProjDir=. Index: squid/port/win32/squid.dsw =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid.dsw,v retrieving revision 1.1.38.3 retrieving revision 1.1.38.4 diff -u -r1.1.38.3 -r1.1.38.4 --- squid/port/win32/squid.dsw 24 May 2006 20:28:56 -0000 1.1.38.3 +++ squid/port/win32/squid.dsw 2 Jun 2006 11:57:46 -0000 1.1.38.4 @@ -191,6 +191,9 @@ Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name modules + End Project Dependency }}} ############################################################################### Index: squid/port/win32/squid_mswin.mak =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid_mswin.mak,v retrieving revision 1.1.38.1 retrieving revision 1.1.38.2 diff -u -r1.1.38.1 -r1.1.38.2 --- squid/port/win32/squid_mswin.mak 16 May 2006 21:05:58 -0000 1.1.38.1 +++ squid/port/win32/squid_mswin.mak 2 Jun 2006 11:57:46 -0000 1.1.38.2 @@ -13,7 +13,7 @@ srcdir = ..\..\src docdir = ..\..\doc win32includedir = .\include -iconsdir = $(top_srcdir)\icons +iconsdir = $(top_srcdir)\icons # Gotta love the DOS legacy # @@ -45,6 +45,7 @@ DEFAULT_ERROR_DIR = $(datadir)/errors/English DEFAULT_MIB_PATH = $(datadir)/mib.txt DEFAULT_HOSTS = none +!INCLUDE squid_version.mak AUTH_MODULES = basic ntlm digest negotiate REPL_POLICIES = lru heap @@ -55,6 +56,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 --- /dev/null Wed Feb 14 01:15:53 2007 +++ squid/port/win32/squid_version.cmd Wed Feb 14 01:16:02 2007 @@ -0,0 +1,12 @@ +@echo off +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: squid/port/win32/include/autoconf.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/autoconf.h,v retrieving revision 1.1.38.4 retrieving revision 1.1.38.5 diff -u -r1.1.38.4 -r1.1.38.5 --- squid/port/win32/include/autoconf.h 27 May 2006 13:56:13 -0000 1.1.38.4 +++ squid/port/win32/include/autoconf.h 2 Jun 2006 11:57:46 -0000 1.1.38.5 @@ -627,24 +627,6 @@ /* Define if NTLM is allowed to fail gracefully when a helper has problems */ /* #undef NTLM_FAIL_OPEN */ -/* Name of package */ -#define PACKAGE "squid" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - /* Enable support for Transparent Proxy on systems using PF address redirection. This provides "masquerading" support for OpenBSD. */ /* #undef PF_TRANSPARENT */