Changeset: 9aa7e88e600e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9aa7e88e600e Modified Files: MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag gdk/libbat.rc monetdb5/tools/libmonetdb5.rc vertoo.data Branch: Dec2016 Log Message:
Pre-release version number update. diffs (truncated from 368 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %define name MonetDB -%define version 11.25.12 +%define version 11.25.13 %{!?buildno: %global buildno %(date +%Y%m%d)} # groups of related archs diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj b/NT/installer32/MonetDB-ODBC-Installer.vdproj --- a/NT/installer32/MonetDB-ODBC-Installer.vdproj +++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj @@ -566,15 +566,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB ODBC Driver" - "ProductCode" = "8:{C195BD0F-3601-49D9-A5DF-A50961208018}" - "PackageCode" = "8:{0FF022C4-2301-42DE-A199-6204A1BBCEFB}" + "ProductCode" = "8:{34DCFFF8-9C25-43E3-85AA-37F8F443E55E}" + "PackageCode" = "8:{BEFD35D8-5EFA-4E72-83E4-8D3676999F16}" "UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.25.12" + "ProductVersion" = "8:11.25.13" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.monetdb.org/" diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj b/NT/installer32/MonetDB5-Geom-Module.vdproj --- a/NT/installer32/MonetDB5-Geom-Module.vdproj +++ b/NT/installer32/MonetDB5-Geom-Module.vdproj @@ -431,15 +431,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5 SQL GIS Module" - "ProductCode" = "8:{3AB2D215-0644-4FA6-B2AD-AA97DB06B19C}" - "PackageCode" = "8:{848754C1-3F18-42F4-9ECF-E3C709E8BCB6}" + "ProductCode" = "8:{0195AAE1-BCFB-4763-B99E-E97D97606542}" + "PackageCode" = "8:{DAB2DE40-A676-4E59-9BB0-F250FB479F42}" "UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.25.12" + "ProductVersion" = "8:11.25.13" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.monetdb.org/" diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj b/NT/installer32/MonetDB5-SQL-Installer.vdproj --- a/NT/installer32/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj @@ -4340,15 +4340,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5" - "ProductCode" = "8:{F8651098-D720-42F2-8155-1D0F6BA159E1}" - "PackageCode" = "8:{B3E028EB-BBEC-42E7-BDE0-7AFDD0C30B86}" + "ProductCode" = "8:{73263B22-467D-4AFB-A482-85A500B2E488}" + "PackageCode" = "8:{43E9F9AD-1D31-4D94-975C-5B672DC5D3A1}" "UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.25.12" + "ProductVersion" = "8:11.25.13" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.monetdb.org/" diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj b/NT/installer64/MonetDB-ODBC-Installer.vdproj --- a/NT/installer64/MonetDB-ODBC-Installer.vdproj +++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj @@ -566,15 +566,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB ODBC Driver" - "ProductCode" = "8:{B339211D-290C-4CB1-908B-45706FF4806C}" - "PackageCode" = "8:{2EE944EC-B149-45FE-B89E-208847F3C22B}" + "ProductCode" = "8:{DB295B16-FB00-45CF-BE0A-4D9E3D9388BC}" + "PackageCode" = "8:{B7F5F1F2-B2C9-43EF-8F1D-C9F43624F5FF}" "UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.25.12" + "ProductVersion" = "8:11.25.13" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.monetdb.org/" diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj b/NT/installer64/MonetDB5-Geom-Module.vdproj --- a/NT/installer64/MonetDB5-Geom-Module.vdproj +++ b/NT/installer64/MonetDB5-Geom-Module.vdproj @@ -431,15 +431,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5 SQL GIS Module" - "ProductCode" = "8:{8DAC70E9-FAC7-4518-985C-C0C6452EA275}" - "PackageCode" = "8:{5929A2D9-48E3-4C57-A4B4-AB15971D6DF9}" + "ProductCode" = "8:{FBB21CE0-218D-43D6-890A-A8731C456B05}" + "PackageCode" = "8:{0F51370B-82A1-47CE-800E-EC8BCDF84D0E}" "UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.25.12" + "ProductVersion" = "8:11.25.13" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.monetdb.org/" diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj b/NT/installer64/MonetDB5-SQL-Installer.vdproj --- a/NT/installer64/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj @@ -4340,15 +4340,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5" - "ProductCode" = "8:{A9E45F5D-BD7A-4276-B1DC-A8706901EE0A}" - "PackageCode" = "8:{1619399B-1F46-44C9-87C7-FAFB3EA2DBEF}" + "ProductCode" = "8:{23C6ECB5-9CAE-43EA-A7CA-BD2B38CC8E03}" + "PackageCode" = "8:{A9674C00-C96B-4DF1-B350-2364C7A561B4}" "UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.25.12" + "ProductVersion" = "8:11.25.13" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.monetdb.org/" diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -754,7 +754,7 @@ #define MONETDB5_PASSWDHASH_TOKEN SHA512 /* Release name or "unreleased" */ -#define MONETDB_RELEASE "unreleased" +#define MONETDB_RELEASE "Dec2016-SP3" /* Suffix for C++ files */ #define MX_CXX_SUFFIX "cxx" @@ -772,13 +772,13 @@ #define PACKAGE_NAME "MonetDB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MonetDB 11.25.12" +#define PACKAGE_STRING "MonetDB 11.25.13" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "MonetDB" /* Define to the version of this package. */ -#define PACKAGE_VERSION "11.25.12" +#define PACKAGE_VERSION "11.25.13" /* Define to the home page for this package. */ #define PACKAGE_URL "" diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -6,7 +6,7 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V. -VERSION=11.25.12 +VERSION=11.25.13 # ^^^^^^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc --- a/clients/mapilib/mapi.rc +++ b/clients/mapilib/mapi.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,25,12,1 - PRODUCTVERSION 11,25,12,1 + FILEVERSION 11,25,13,1 + PRODUCTVERSION 11,25,13,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB Application Interface DLL\0" - VALUE "FileVersion", "11.25.12\0" + VALUE "FileVersion", "11.25.13\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. @@ -28,7 +28,7 @@ BEGIN VALUE "OriginalFilename", "Mapi.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Client Libraries\0" - VALUE "ProductVersion", "11.25.12\0" + VALUE "ProductVersion", "11.25.13\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc --- a/clients/odbc/driver/driver.rc +++ b/clients/odbc/driver/driver.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,25,12,1 - PRODUCTVERSION 11,25,12,1 + FILEVERSION 11,25,13,1 + PRODUCTVERSION 11,25,13,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB ODBC Driver DLL\0" - VALUE "FileVersion", "11.25.12\0" + VALUE "FileVersion", "11.25.13\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. @@ -28,7 +28,7 @@ BEGIN VALUE "OriginalFilename", "libMonetODBC.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB SQL Server\0" - VALUE "ProductVersion", "11.25.12\0" + VALUE "ProductVersion", "11.25.13\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc --- a/clients/odbc/winsetup/setup.rc +++ b/clients/odbc/winsetup/setup.rc @@ -62,8 +62,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 11,25,12,1 - PRODUCTVERSION 11,25,12,1 + FILEVERSION 11,25,13,1 + PRODUCTVERSION 11,25,13,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -80,12 +80,12 @@ BEGIN BEGIN VALUE "CompanyName", "MonetDB B.V." VALUE "FileDescription", "MonetDB ODBC Setup DLL" - VALUE "FileVersion", "11.25.12" + VALUE "FileVersion", "11.25.13" VALUE "InternalName", "libMonetODBCs.dll" VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2017" VALUE "OriginalFilename", "libMonetODBCs.dll" VALUE "ProductName", "MonetDB SQL Server" - VALUE "ProductVersion", "11.25.12" + VALUE "ProductVersion", "11.25.13" END END BLOCK "VarFileInfo" diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -46,7 +46,7 @@ dnl configure file, whereas comments st dnl (including their trailing newline). AC_PREREQ([2.63]) -AC_INIT([MonetDB], [11.25.12], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) +AC_INIT([MonetDB], [11.25.13], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) AC_CONFIG_AUX_DIR([buildtools/conf]) AC_CONFIG_MACRO_DIR([buildtools/conf]) AC_CANONICAL_HOST @@ -60,7 +60,7 @@ AC_SUBST([CONFIG_H], [monetdb_config.h]) HOST=[$target] AC_DEFINE_UNQUOTED([HOST], ["$HOST"], [Host identifier]) -AC_DEFINE([MONETDB_RELEASE], ["unreleased"], [Release name or "unreleased"]) +AC_DEFINE([MONETDB_RELEASE], ["Dec2016-SP3"], [Release name or "unreleased"]) AS_VAR_IF([target_os], [cygwin], [AC_DEFINE([WIN32], 1, [Define on Microsoft Windows (also under Cygwin)])]) diff --git a/gdk/libbat.rc b/gdk/libbat.rc --- a/gdk/libbat.rc +++ b/gdk/libbat.rc @@ -3,8 +3,8 @@ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list