Changeset: 020958ef8164 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=020958ef8164
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/rules.msc
buildtools/ChangeLog
buildtools/ChangeLog.Apr2011
clients/ChangeLog
clients/ChangeLog.Apr2011
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/ChangeLog
gdk/ChangeLog.Apr2011
gdk/libbat.rc
geom/ChangeLog
geom/ChangeLog.Apr2011
java/ChangeLog
java/ChangeLog.Apr2011
monetdb5/ChangeLog
monetdb5/ChangeLog.Apr2011
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
sql/ChangeLog.Apr2011
template/ChangeLog
template/ChangeLog.Apr2011
template/configure.ag
testing/ChangeLog
testing/ChangeLog.Apr2011
tools/merovingian/ChangeLog
tools/merovingian/ChangeLog.Apr2011
vertoo.data
Branch: Apr2011
Log Message:
Step one towards a new stable branch "Apr2011".
Incremented version numbers.
Moved ChangeLog file to ChangeLog.Apr2011.
Disabled tests that fail but are not going to be fixed.
Fixed test output for running with assertions disabled.
The root of the stable branch is "Apr2011_root".
diffs (truncated from 367 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.2.0
+%define version 11.3.0
%{!?buildno: %define 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
@@ -573,7 +573,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.2.0"
+ "ProductVersion" = "8:11.3.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -432,7 +432,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.2.0"
+ "ProductVersion" = "8:11.3.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -2665,7 +2665,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.2.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.3.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3705,7 +3705,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.2.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.3.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5109,7 +5109,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.2.0"
+ "Name" = "8:MonetDB-SQL-11.3.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5158,7 +5158,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.2.0"
+ "ProductVersion" = "8:11.3.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -573,7 +573,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.2.0"
+ "ProductVersion" = "8:11.3.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -432,7 +432,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.2.0"
+ "ProductVersion" = "8:11.3.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -2665,7 +2665,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.2.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.3.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3705,7 +3705,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.2.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.3.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5109,7 +5109,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.2.0"
+ "Name" = "8:MonetDB-SQL-11.3.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5158,7 +5158,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.2.0"
+ "ProductVersion" = "8:11.3.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -17,7 +17,7 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.2.0
+VERSION=11.3.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Apr2011
rename from buildtools/ChangeLog
rename to buildtools/ChangeLog.Apr2011
diff --git a/clients/ChangeLog b/clients/ChangeLog.Apr2011
rename from clients/ChangeLog
rename to clients/ChangeLog.Apr2011
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,2,0,1
- PRODUCTVERSION 11,2,0,1
+ FILEVERSION 11,3,0,1
+ PRODUCTVERSION 11,3,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "CWI\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.2.0\0"
+ VALUE "FileVersion", "11.3.0\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 @@
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", "11.2.0\0"
+ VALUE "ProductVersion", "11.3.0\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,2,0,1
- PRODUCTVERSION 11,2,0,1
+ FILEVERSION 11,3,0,1
+ PRODUCTVERSION 11,3,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "CWI\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", "11.2.0\0"
+ VALUE "FileVersion", "11.3.0\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 @@
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", "11.2.0\0"
+ VALUE "ProductVersion", "11.3.0\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 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,2,0,1
- PRODUCTVERSION 11,2,0,1
+ FILEVERSION 11,3,0,1
+ PRODUCTVERSION 11,3,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -80,12 +80,12 @@
BEGIN
VALUE "CompanyName", "CWI"
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
- VALUE "FileVersion", "11.2.0"
+ VALUE "FileVersion", "11.3.0"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB BV 2008-2011"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", "11.2.0"
+ VALUE "ProductVersion", "11.3.0"
END
END
BLOCK "VarFileInfo"
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -21,7 +21,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.60)
-AC_INIT([MonetDB], [11.2.0], [i...@monetdb.org], [MonetDB])
+AC_INIT([MonetDB], [11.3.0], [i...@monetdb.org], [MonetDB])
AC_CONFIG_AUX_DIR([buildtools/conf])
AC_CONFIG_MACRO_DIR([buildtools/conf])
AC_CANONICAL_HOST
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Apr2011
rename from gdk/ChangeLog
rename to gdk/ChangeLog.Apr2011
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,2,0,1
- PRODUCTVERSION 11,2,0,1
+ FILEVERSION 11,3,0,1
+ PRODUCTVERSION 11,3,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "CWI\0"
VALUE "FileDescription", "MonetDB Goblin Database Kernel DLL\0"
- VALUE "FileVersion", "11.2.0\0"
+ VALUE "FileVersion", "11.3.0\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 @@
VALUE "OriginalFilename", "libbat.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Common Libraries\0"
- VALUE "ProductVersion", "11.2.0\0"
+ VALUE "ProductVersion", "11.3.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/geom/ChangeLog b/geom/ChangeLog.Apr2011
rename from geom/ChangeLog
rename to geom/ChangeLog.Apr2011
diff --git a/java/ChangeLog b/java/ChangeLog.Apr2011
rename from java/ChangeLog
rename to java/ChangeLog.Apr2011
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
