Changeset: 530b129dc622 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=530b129dc622
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
configure.ag
Branch: default
Log Message:
Merge with Mar2011 branch.
diffs (115 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.0.0
+%define version 11.2.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
%define release %{buildno}%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
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
@@ -2735,7 +2735,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.0.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.2.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3835,7 +3835,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.0.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.2.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5239,7 +5239,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.0.0"
+ "Name" = "8:MonetDB-SQL-11.2.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
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
@@ -2735,7 +2735,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.0.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.2.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3835,7 +3835,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.0.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.2.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5239,7 +5239,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.0.0"
+ "Name" = "8:MonetDB-SQL-11.2.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
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.0.0], [i...@monetdb.org], [MonetDB])
+AC_INIT([MonetDB], [11.2.0], [i...@monetdb.org], [MonetDB])
AC_CONFIG_AUX_DIR([buildtools/conf])
AC_CONFIG_MACRO_DIR([buildtools/conf])
AC_CANONICAL_HOST
diff --git a/vertoo.config b/vertoo.config
--- a/vertoo.config
+++ b/vertoo.config
@@ -8,7 +8,7 @@
# %q - version number surrounded by single quotes
# %Q - version number surrounded by double quotes
-main.addAnchor("configure.ag", "[MonetDB Common], [%v]")
+main.addAnchor("configure.ag", "[MonetDB], [%v]")
main.addAnchor("MonetDB.spec", "%define version %v")
main.addAnchor("NT/rules.msc", "VERSION=%v")
main.addAnchors("gdk/libbat.rc",
@@ -63,8 +63,20 @@
format = "@normal"))
main.addAnchors("NT/installer32/MonetDB5-SQL-Installer.vdproj",
arguments(pattern = '"ProductVersion" = "8:%v"',
+ format = "@normal"),
+ arguments(pattern = r'MonetDB-SQL-%v\\dump-restore.txt',
+ format = "@normal"),
+ arguments(pattern = r'MonetDB-SQL-%v\\dump-restore.html',
+ format = "@normal"),
+ arguments(pattern = '"8:MonetDB-SQL-%v"',
format = "@normal"))
main.addAnchors("NT/installer64/MonetDB5-SQL-Installer.vdproj",
arguments(pattern = '"ProductVersion" = "8:%v"',
+ format = "@normal"),
+ arguments(pattern = r'MonetDB-SQL-%v\\dump-restore.txt',
+ format = "@normal"),
+ arguments(pattern = r'MonetDB-SQL-%v\\dump-restore.html',
+ format = "@normal"),
+ arguments(pattern = '"8:MonetDB-SQL-%v"',
format = "@normal"))
main.addAnchor("template/configure.ag", "[MonetDB template], [%v]")
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
