[prev in list] [next in list] [prev in thread] [next in thread] 

List:       monetdb-sql-checkins
Subject:    [Monetdb-sql-checkins] geom RunMserver5.bat, , 1.1,
From:       Sjoerd Mullender <sjoerd () users ! sourceforge ! net>
Date:       2008-06-24 7:55:51
Message-ID: E1KB3O2-0006oX-M1 () mail ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/monetdb/geom
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11793

Modified Files:
	RunMserver.bat.in 
Added Files:
	RunMserver5.bat 
Log Message:
propagated changes of Monday Jun 23 2008 - Tuesday Jun 24 2008
from the Geom_0-4 branch to the development trunk

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/23 - sjoerd: RunMserver.bat.in,1.1.1.1.4.2 RunMserver5.bat,1.1.2.1
        NT/.cvsignore,1.1.1.1.4.1 NT/Makefile,1.4.4.1
        NT/MonetDB5-Geom/.cvsignore,1.1.2.1
        NT/MonetDB5-Geom/MonetDB5-Geom-Module.sln,1.1.2.1
        NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj,1.1.2.1
        NT/MonetDB5-Geom64/.cvsignore,1.1.2.1
        NT/MonetDB5-Geom64/MonetDB5-Geom-Module.sln,1.1.2.1
        NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj,1.1.2.1
Created installers.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/23 - sjoerd: NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj,1.1.2.2
        NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj,1.1.2.2
Require installation of M5/SQL and use install path that it's installation registered.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/24 - sjoerd: NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj,1.1.2.3
        NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj,1.1.2.3
Updated version number.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: RunMserver.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMserver.bat.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- RunMserver.bat.in	23 Jun 2008 14:22:56 -0000	1.2
+++ RunMserver.bat.in	24 Jun 2008 07:55:45 -0000	1.3
@@ -2,20 +2,28 @@
 
 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
 
 set monetdb4_prefix=@XMONETDB4_PREFIX@
 set monetdb5_prefix=@XMONETDB5_PREFIX@
+set sql_prefix=@XSQL_PREFIX@
 
 if %V% == 4 call "%monetdb4_prefix%\bin\monetdb4-config.bat" --internal
 if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
+call "%sql_prefix%\bin\monetdb-sql-config.bat" --internal
 
 set builddir=@GEOM_BUILD@
 
 set MOD_PATH=%modpath%
+if %V% == 4 set MOD_PATH=%modpath4%;%MOD_PATH%
+if %V% == 5 set MOD_PATH=%modpath5%;%MOD_PATH%
+
 set MOD_PATH=%builddir%\src\sql;%MOD_PATH%
 set MOD_PATH=%builddir%\src\monetdb%V%;%MOD_PATH%
 set MOD_PATH=%builddir%\src\monetdb%V%\.libs;%MOD_PATH%
@@ -29,6 +37,6 @@
 if %V% == 4 set mserver=Mserver.exe
 if %V% == 5 set mserver=mserver5.exe
 
-%mserver% --set "monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm" %1 %2 %3 %4 %5 %6 %7 %8 %9
+%mserver% --set "monet_mod_path=%MOD_PATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 endlocal

--- NEW FILE: RunMserver5.bat ---
@call RunMserver.bat -5 %*


-------------------------------------------------------------------------
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
Monetdb-sql-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
[prev in list] [next in list] [prev in thread] [next in thread]