Changeset: 4b3298ffb15c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b3298ffb15c
Modified Files:
clients/NT/Makefile.ag
clients/NT/m4client.bat
clients/NT/mclient.bat
Branch: Mar2011
Log Message:
Use m4client.bat in addition to m4client.exe.
diffs (50 lines):
diff --git a/clients/NT/Makefile.ag b/clients/NT/Makefile.ag
--- a/clients/NT/Makefile.ag
+++ b/clients/NT/Makefile.ag
@@ -20,3 +20,10 @@
DIR = prefix
SOURCES = mclient.bat msqldump.bat
}
+
+scripts_bat4 = {
+ COND = HAVE_MONETDB4
+ EXT = bat
+ DIR = prefix
+ SOURCES = mclient4.bat
+}
diff --git a/clients/NT/m4client.bat b/clients/NT/m4client.bat
new file mode 100755
--- /dev/null
+++ b/clients/NT/m4client.bat
@@ -0,0 +1,20 @@
+@echo off
+rem figure out the folder name
+set MONETDB=%~dp0
+
+rem remove the final backslash from the path
+set MONETDB=%MONETDB:~0,-1%
+
+rem extend the search path with our EXE and DLL folders
+rem we depend on pthreadVCE.dll having been copied to the lib folder
+set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH%
+
+if not "%1"=="/STARTED-FROM-MENU" goto skip
+shift
+if "%DOTMONETDBFILE%"=="" if exist "%MONETDB%\etc\.monetdb" set
DOTMONETDBFILE=%MONETDB%\etc\.monetdb
+:skip
+
+rem start the real client
+"%MONETDB%\bin\m4client.exe" %1 %2 %3 %4 %5 %6 %7 %8
+
+if ERRORLEVEL 1 pause
diff --git a/clients/NT/mclient.bat b/clients/NT/mclient.bat
--- a/clients/NT/mclient.bat
+++ b/clients/NT/mclient.bat
@@ -15,6 +15,6 @@
:skip
rem start the real client
-"%MONETDB%\bin\m4client.exe" %1 %2 %3 %4 %5 %6 %7 %8
+"%MONETDB%\bin\mclient.exe" %1 %2 %3 %4 %5 %6 %7 %8
if ERRORLEVEL 1 pause
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
