Changeset: 99d16aff6ce6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99d16aff6ce6 Modified Files: Branch: default Log Message:
Merge from Jun2010 branch. diffs (166 lines): diff -r 4d32d055c1ea -r 99d16aff6ce6 clients/NT/Makefile --- a/clients/NT/Makefile Thu Jun 17 13:47:19 2010 +0200 +++ b/clients/NT/Makefile Thu Jun 17 14:39:08 2010 +0200 @@ -19,7 +19,7 @@ IBITS = 64 !ENDIF -all: "$(SRCDIR)\Makefile.msc" all-msc $(UNISTD_H) inttypes.h Runmclient.bat RunMtest.bat RunMapprove.bat +all: "$(SRCDIR)\Makefile.msc" all-msc $(UNISTD_H) inttypes.h Runmclient.bat RunMtest.bat RunMapprove.bat .monetdb $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" "bits=$(bits)" all check: "$(SRCDIR)\Makefile.msc" @@ -30,6 +30,7 @@ $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" "bits=$(bits)" install if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\mclient.bat "$(prefix)" if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\msqldump.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" @@ -74,6 +75,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 + Runmclient.bat: "$(SRCDIR)\Runmclient.bat.in" $(CONFIGURE) "$(SRCDIR)\Runmclient.bat.in" > Runmclient.bat diff -r 4d32d055c1ea -r 99d16aff6ce6 pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj --- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Thu Jun 17 13:47:19 2010 +0200 +++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Thu Jun 17 14:39:08 2010 +0200 @@ -813,6 +813,12 @@ } "Entry" { + "MsmKey" = "8:_E37FEE23A93548469BB7560D5524BD93" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_E4A29EC2213B4C99B49B7AC34E99F880" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -3654,6 +3660,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E37FEE23A93548469BB7560D5524BD93" + { + "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}:_E4A29EC2213B4C99B49B7AC34E99F880" { "SourcePath" = "8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll" @@ -4371,7 +4397,7 @@ "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3" { "Name" = "8:MonetDB XQuery Client" - "Arguments" = "8:--language=xquery --encoding=cp437" + "Arguments" = "8:/STARTED-FROM-MENU --language=xquery --encoding=cp437" "Description" = "8:" "ShowCmd" = "3:1" "IconIndex" = "3:0" diff -r 4d32d055c1ea -r 99d16aff6ce6 pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj --- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun 17 13:47:19 2010 +0200 +++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun 17 14:39:08 2010 +0200 @@ -51,6 +51,12 @@ } "Entry" { + "MsmKey" = "8:_0EF9137A18874950B2B979E4A3D14364" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_0F0962C21371457C8ABE0A563FC8A41A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1122,6 +1128,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0EF9137A18874950B2B979E4A3D14364" + { + "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}:_0F0962C21371457C8ABE0A563FC8A41A" { "SourcePath" = "8:share\\MonetDB\\xrpc\\admin\\index.html" @@ -4339,7 +4365,7 @@ "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3" { "Name" = "8:MonetDB XQuery Client" - "Arguments" = "8:--language=xquery --encoding=cp437" + "Arguments" = "8:/STARTED-FROM-MENU --language=xquery --encoding=cp437" "Description" = "8:" "ShowCmd" = "3:1" "IconIndex" = "3:0" diff -r 4d32d055c1ea -r 99d16aff6ce6 sql/NT/Makefile --- a/sql/NT/Makefile Thu Jun 17 13:47:19 2010 +0200 +++ b/sql/NT/Makefile Thu Jun 17 14:39:08 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 .monetdb +all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h inttypes.h RunMserver.bat RunMtest.bat RunMapprove.bat $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" "bits=$(bits)" all check: "$(SRCDIR)\Makefile.msc" RunMtest.bat @@ -28,7 +28,6 @@ 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" @@ -79,10 +78,6 @@ $(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 _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list