Changeset: b013734d7941 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b013734d7941
Modified Files:
NT/installer32/MonetDB4-XQuery-Installer.vdproj
NT/installer64/MonetDB4-XQuery-Installer.vdproj
Branch: default
Log Message:
Merge with Mar2011 branch.
diffs (73 lines):
diff --git a/NT/installer32/MonetDB4-XQuery-Installer.vdproj
b/NT/installer32/MonetDB4-XQuery-Installer.vdproj
--- a/NT/installer32/MonetDB4-XQuery-Installer.vdproj
+++ b/NT/installer32/MonetDB4-XQuery-Installer.vdproj
@@ -1204,8 +1204,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_10AB8DCD4D3D45BB90C8DF897878ABE2"
{
- "SourcePath" = "8:bin\\mclient4.exe"
- "TargetName" = "8:mclient4.exe"
+ "SourcePath" = "8:bin\\m4client.exe"
+ "TargetName" = "8:m4client.exe"
"Tag" = "8:"
"Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
@@ -1304,8 +1304,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_14A0495208064DCA9A6222547E8C9052"
{
- "SourcePath" = "8:mclient.bat"
- "TargetName" = "8:mclient.bat"
+ "SourcePath" = "8:m4client.bat"
+ "TargetName" = "8:m4client.bat"
"Tag" = "8:"
"Folder" = "8:_D9A7267FC9784D8BBD3CBC6EC1754DBE"
"Condition" = "8:"
diff --git a/NT/installer64/MonetDB4-XQuery-Installer.vdproj
b/NT/installer64/MonetDB4-XQuery-Installer.vdproj
--- a/NT/installer64/MonetDB4-XQuery-Installer.vdproj
+++ b/NT/installer64/MonetDB4-XQuery-Installer.vdproj
@@ -1204,8 +1204,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_10AB8DCD4D3D45BB90C8DF897878ABE2"
{
- "SourcePath" = "8:bin\\mclient4.exe"
- "TargetName" = "8:mclient4.exe"
+ "SourcePath" = "8:bin\\m4client.exe"
+ "TargetName" = "8:m4client.exe"
"Tag" = "8:"
"Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
@@ -1304,8 +1304,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_14A0495208064DCA9A6222547E8C9052"
{
- "SourcePath" = "8:mclient.bat"
- "TargetName" = "8:mclient.bat"
+ "SourcePath" = "8:m4client.bat"
+ "TargetName" = "8:m4client.bat"
"Tag" = "8:"
"Folder" = "8:_D9A7267FC9784D8BBD3CBC6EC1754DBE"
"Condition" = "8:"
diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag
--- a/clients/mapilib/Makefile.ag
+++ b/clients/mapilib/Makefile.ag
@@ -28,7 +28,7 @@
lib_mapi4 = {
COND = HAVE_MONETDB4
SOURCES = mapi.mx mapi.rc
- LIBS = $(SOCKET_LIBS) ../../common/stream/libstream \
+ LIBS = $(SOCKET_LIBS) ../../common/stream/libstream4 \
../../common/options/libmoptions $(openssl_LIBS)
}
diff --git a/vertoo.config b/vertoo.config
--- a/vertoo.config
+++ b/vertoo.config
@@ -9,6 +9,7 @@
# %Q - version number surrounded by double quotes
main.addAnchor("configure.ag", "[MonetDB Common], [%v]")
+main.addAnchor("MonetDB.spec", "%define version %v")
main.addAnchor("NT/rules.msc", "VERSION=%v")
main.addAnchors("gdk/libbat.rc",
'VALUE "FileVersion", "%v\\0"',
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
