Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14068
Modified Files:
RunMserver.bat.in
Log Message:
propagated changes of Monday Jun 23 2008 - Tuesday Jun 24 2008
from the SQL_2-24 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/23 - sjoerd: RunMserver.bat.in,1.8.4.1 NT/Makefile,1.25.2.1
Cleanup.
M5 is default if present, else M4 is default.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/23 - sjoerd: NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj,1.19.2.7
NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj,1.9.2.7
Register installation path.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/24 - sjoerd: NT/MonetDB4-SQL/MonetDB4-SQL-Installer.vdproj,1.11.2.7
NT/MonetDB4-SQL64/MonetDB4-SQL-Installer.vdproj,1.6.2.8
NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj,1.19.2.8
NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj,1.9.2.8
Updated version number.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: RunMserver.bat.in
===================================================================
RCS file: /cvsroot/monetdb/sql/RunMserver.bat.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- RunMserver.bat.in 8 Oct 2007 09:37:55 -0000 1.8
+++ RunMserver.bat.in 24 Jun 2008 07:59:42 -0000 1.9
@@ -2,8 +2,11 @@
setlocal
-rem default back end is MonetDB4
-set V=4
+rem if both M4 & M5 are available, M5 is default;
+rem otherwise, the available one is default
+if "@HAVE_MONETDB4_FALSE@" == "#" set V=4
+if "@HAVE_MONETDB5_FALSE@" == "#" set V=5
+rem commandline option overrules default
if "%1" == "-4" set V=4& shift
if "%1" == "-5" set V=5& shift
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
