Changeset: 952146ee5535 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=952146ee5535
Modified Files:
debian/libmonetdb-client-odbc1.install
debian/libmonetdb-client1.install
debian/libmonetdb-stream1.install
debian/libmonetdb1.install
debian/libmonetdb4-server-geom0.install
debian/libmonetdb4-xquery0.install
debian/libmonetdb5-server-geom0.install
debian/libpf-ferry0.install
Branch: default
Log Message:
Merge with Mar2011 branch.
diffs (86 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 = m4client.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
diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -35,7 +35,7 @@
COND = HAVE_MONETDB4
SOURCES = mclient.c ReadlineTools.c
LIBS = libmcutil ../mapilib/libmapi4 \
- ../../common/stream/libstream \
+ ../../common/stream/libstream4 \
$(READLINE_LIBS) \
$(curl_LIBS) $(LTLIBICONV)
}
diff --git a/debian/libmonetdb-client-odbc1.install
b/debian/libmonetdb-client-odbc11.install
rename from debian/libmonetdb-client-odbc1.install
rename to debian/libmonetdb-client-odbc11.install
diff --git a/debian/libmonetdb-client1.install
b/debian/libmonetdb-client11.install
rename from debian/libmonetdb-client1.install
rename to debian/libmonetdb-client11.install
diff --git a/debian/libmonetdb-stream1.install
b/debian/libmonetdb-stream11.install
rename from debian/libmonetdb-stream1.install
rename to debian/libmonetdb-stream11.install
diff --git a/debian/libmonetdb1.install b/debian/libmonetdb11.install
rename from debian/libmonetdb1.install
rename to debian/libmonetdb11.install
diff --git a/debian/libmonetdb4-server-geom0.install
b/debian/libmonetdb4-server-geom11.install
rename from debian/libmonetdb4-server-geom0.install
rename to debian/libmonetdb4-server-geom11.install
diff --git a/debian/libmonetdb4-xquery0.install
b/debian/libmonetdb4-xquery11.install
rename from debian/libmonetdb4-xquery0.install
rename to debian/libmonetdb4-xquery11.install
diff --git a/debian/libmonetdb5-server-geom0.install
b/debian/libmonetdb5-server-geom11.install
rename from debian/libmonetdb5-server-geom0.install
rename to debian/libmonetdb5-server-geom11.install
diff --git a/debian/libpf-ferry0.install b/debian/libpf-ferry11.install
rename from debian/libpf-ferry0.install
rename to debian/libpf-ferry11.install
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
