Changeset: ca5de789af67 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca5de789af67
Modified Files:
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge from Jun2010 branch.
diffs (229 lines):
diff -r 20f7b1dd3807 -r ca5de789af67 clients/NT/mclient.bat
--- a/clients/NT/mclient.bat Thu Jun 17 13:05:14 2010 +0200
+++ b/clients/NT/mclient.bat Thu Jun 17 13:16:38 2010 +0200
@@ -1,14 +1,20 @@
-...@rem figure out the folder name
-...@set MONETDB=%~dp0
+...@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 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%
+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%
-...@rem start the real client
-@"%MONETDB%\bin\mclient.exe" %*
+if "%1"=="/STARTED-FROM-MENU" (
+shift
+if "%DOTMONETDBFILE%"=="" if exist "%MONETDB%\etc\.monetdb" set
DOTMONETDBFILE=%MONETDB%\etc\.monetdb
+)
-...@if ERRORLEVEL 1 pause
+rem start the real client
+"%MONETDB%\bin\mclient.exe" %1 %2 %3 %4 %5 %6 %7 %8
+
+if ERRORLEVEL 1 pause
diff -r 20f7b1dd3807 -r ca5de789af67
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 13:05:14 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 13:16:38 2010 +0200
@@ -4371,7 +4371,7 @@
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3"
{
"Name" = "8:MonetDB XQuery Client"
- "Arguments" = "8:--language=xquery --user=monetdb --passwd=monetdb
--encoding=cp437"
+ "Arguments" = "8:--language=xquery --encoding=cp437"
"Description" = "8:"
"ShowCmd" = "3:1"
"IconIndex" = "3:0"
diff -r 20f7b1dd3807 -r ca5de789af67
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 13:05:14 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 13:16:38 2010 +0200
@@ -4339,7 +4339,7 @@
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3"
{
"Name" = "8:MonetDB XQuery Client"
- "Arguments" = "8:--language=xquery --user=monetdb --passwd=monetdb
--encoding=cp437"
+ "Arguments" = "8:--language=xquery --encoding=cp437"
"Description" = "8:"
"ShowCmd" = "3:1"
"IconIndex" = "3:0"
diff -r 20f7b1dd3807 -r ca5de789af67 sql/NT/Makefile
--- a/sql/NT/Makefile Thu Jun 17 13:05:14 2010 +0200
+++ b/sql/NT/Makefile Thu Jun 17 13:16:38 2010 +0200
@@ -18,7 +18,7 @@
IBITS = 64
!ENDIF
-all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h inttypes.h RunMserver.bat
RunMtest.bat RunMapprove.bat
+all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h inttypes.h RunMserver.bat
RunMtest.bat RunMapprove.bat .monetdb
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
check: "$(SRCDIR)\Makefile.msc" RunMtest.bat
@@ -28,6 +28,7 @@
install: targetdirs all install-m5installer $(INSTALLER_PREREQ)
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\MSQLserver.bat
"$(prefix)"
+ $(INSTALL) .monetdb "$(sysconfdir)"
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln "$(prefix)"
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj "$(prefix)"
-if exist "C:\Program Files (x86)" if "$(bits)" == "32"
C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/"
"$(prefix)\$(INSTALLER)$(IBITS).vdproj"
@@ -78,6 +79,10 @@
$(ECHO) typedef int int32_t; >> inttypes.h
$(ECHO) typedef unsigned int uint32_t; >> inttypes.h
+.monetdb:
+ $(ECHO) user=monetdb> .monetdb
+ $(ECHO) password=monetdb>> .monetdb
+
RunMtest.bat: "$(SRCDIR)\RunMtest.bat.in"
$(CONFIGURE) "$(SRCDIR)\RunMtest.bat.in" > RunMtest.bat
diff -r 20f7b1dd3807 -r ca5de789af67
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Jun 17 13:05:14
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Jun 17 13:16:38
2010 +0200
@@ -1269,6 +1269,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_D301CC5DC1BE412A900D7C90166AC804"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_D5C7D6567FD6463E846405B973A4AD8A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -5737,6 +5743,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D301CC5DC1BE412A900D7C90166AC804"
+ {
+ "SourcePath" = "8:etc\\.monetdb"
+ "TargetName" = "8:.monetdb"
+ "Tag" = "8:"
+ "Folder" = "8:_B5DFB5D13EE441F8B42616036AACB603"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D5C7D6567FD6463E846405B973A4AD8A"
{
"SourcePath" = "8:Lib\\MonetDB5\\lib_inet.dll"
@@ -6652,14 +6678,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{02A20762-56A8-453B-9727-93D14EDF1C47}"
- "PackageCode" = "8:{672C31AF-6395-492C-A1E9-536853913386}"
+ "ProductCode" = "8:{A13C217D-5A3C-4789-B22A-CC3909C75520}"
+ "PackageCode" = "8:{9A2AD82A-68DA-41C1-B004-9F650E0E5161}"
"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.14"
+ "ProductVersion" = "8:10.6.17"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
@@ -6797,7 +6823,7 @@
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_105BC55B7EC843888BD574A95670DAA6"
{
"Name" = "8:MonetDB SQL Client"
- "Arguments" = "8:-lsql -umonetdb -Pmonetdb -Ecp437"
+ "Arguments" = "8:/STARTED-FROM-MENU -lsql -Ecp437"
"Description" = "8:"
"ShowCmd" = "3:1"
"IconIndex" = "3:0"
diff -r 20f7b1dd3807 -r ca5de789af67
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Thu Jun 17
13:05:14 2010 +0200
+++ b/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Thu Jun 17
13:16:38 2010 +0200
@@ -1137,6 +1137,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_C9FC7A784EDC4AE283DA767B2D8A4851"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_CAC5B7295651493395CB5167D973DC01"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -5297,6 +5303,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C9FC7A784EDC4AE283DA767B2D8A4851"
+ {
+ "SourcePath" = "8:etc\\.monetdb"
+ "TargetName" = "8:.monetdb"
+ "Tag" = "8:"
+ "Folder" = "8:_B5DFB5D13EE441F8B42616036AACB603"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CAC5B7295651493395CB5167D973DC01"
{
"SourcePath" = "8:monetdb.ico"
@@ -6652,14 +6678,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{B59FF893-DBEB-46A0-B3FE-0C7545213C5A}"
- "PackageCode" = "8:{13BA3119-65C0-4A8F-880E-0B87DE7C15AE}"
+ "ProductCode" = "8:{F5FADC03-B77F-42AE-A618-11CFEFB0C6C5}"
+ "PackageCode" = "8:{8D6D9A71-0463-4034-88FD-A00A934CE8CE}"
"UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.14"
+ "ProductVersion" = "8:10.6.17"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
@@ -6797,7 +6823,7 @@
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_105BC55B7EC843888BD574A95670DAA6"
{
"Name" = "8:MonetDB SQL Client"
- "Arguments" = "8:-lsql -umonetdb -Pmonetdb -Ecp437"
+ "Arguments" = "8:/STARTED-FROM-MENU -lsql -Ecp437"
"Description" = "8:"
"ShowCmd" = "3:1"
"IconIndex" = "3:0"
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
