Changeset: ef4ce53d89cf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef4ce53d89cf
Modified Files:
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (truncated from 352 to 300 lines):
diff -r 6f6f6c5a6df1 -r ef4ce53d89cf
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
--- a/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj Thu Oct 07
09:19:32 2010 +0200
+++ b/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj Thu Oct 07
10:53:25 2010 +0200
@@ -279,12 +279,6 @@
}
"Entry"
{
- "MsmKey" = "8:_4172BA3B364F4430AD7C2E56E586E43C"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_421D3025871A4DAC931ED064077ED58E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -885,6 +879,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_A78371A92476460D8E9980C90A4C8F64"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_A7873EE6932345B4BA1B15736909147D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2235,26 +2235,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4172BA3B364F4430AD7C2E56E586E43C"
- {
- "SourcePath" = "8:Lib\\MonetDB5\\sphinx.mal"
- "TargetName" = "8:sphinx.mal"
- "Tag" = "8:"
- "Folder" = "8:_E7F9CF4E0220468FB71F65052227D019"
- "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}:_421D3025871A4DAC931ED064077ED58E"
{
"SourcePath" = "8:Lib\\MonetDB5\\algebraExtensions.mal"
@@ -4255,6 +4235,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A78371A92476460D8E9980C90A4C8F64"
+ {
+ "SourcePath" = "8:Lib\\MonetDB5\\autoload\\05_xml.mal"
+ "TargetName" = "8:05_xml.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_BB18FF9397F941468F4621DB567CB572"
+ "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}:_A7873EE6932345B4BA1B15736909147D"
{
"SourcePath" = "8:Lib\\MonetDB5\\lib_identifier.dll"
@@ -5614,6 +5614,17 @@
"Property" = "8:_762E204C3D494003AADB714FE800A1AF"
"Folders"
{
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_BB18FF9397F941468F4621DB567CB572"
+ {
+ "Name" = "8:autoload"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" =
"8:_C6A73B2DADDF449C8AF34AFB5FD65960"
+ "Folders"
+ {
+ }
+ }
}
}
}
diff -r 6f6f6c5a6df1 -r ef4ce53d89cf
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
--- a/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj Thu Oct 07
09:19:32 2010 +0200
+++ b/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj Thu Oct 07
10:53:25 2010 +0200
@@ -633,7 +633,7 @@
}
"Entry"
{
- "MsmKey" = "8:_7CAAC72B873E4938AEA736674C9C0799"
+ "MsmKey" = "8:_7E7F713537AC4CF8973417616451C0FD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -3381,12 +3381,12 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7CAAC72B873E4938AEA736674C9C0799"
- {
- "SourcePath" = "8:Lib\\MonetDB5\\sphinx.mal"
- "TargetName" = "8:sphinx.mal"
- "Tag" = "8:"
- "Folder" = "8:_E7F9CF4E0220468FB71F65052227D019"
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7E7F713537AC4CF8973417616451C0FD"
+ {
+ "SourcePath" = "8:Lib\\MonetDB5\\autoload\\05_xml.mal"
+ "TargetName" = "8:05_xml.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_613D07DE3308401AADA393997CB19A2F"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -5620,6 +5620,17 @@
"Property" = "8:_762E204C3D494003AADB714FE800A1AF"
"Folders"
{
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_613D07DE3308401AADA393997CB19A2F"
+ {
+ "Name" = "8:autoload"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" =
"8:_0AD33C31EF454F488503AEE9F2C6B9BB"
+ "Folders"
+ {
+ }
+ }
}
}
}
diff -r 6f6f6c5a6df1 -r ef4ce53d89cf
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Oct 07 09:19:32
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Oct 07 10:53:25
2010 +0200
@@ -741,6 +741,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_6C605D6DB31644C1B23703C74D5B6228"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_6CB7F3EFCD3C419881B01D3C78515F46"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1443,12 +1449,6 @@
}
"Entry"
{
- "MsmKey" = "8:_ED6B146829BC4379B3411F167C29313A"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_ED72E2EAC2394AFE8E6623DED755A97F"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -4039,6 +4039,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C605D6DB31644C1B23703C74D5B6228"
+ {
+ "SourcePath" = "8:Lib\\MonetDB5\\autoload\\05_xml.mal"
+ "TargetName" = "8:05_xml.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_A4A821D237B943CFACE8D54F3F3971E3"
+ "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}:_6CB7F3EFCD3C419881B01D3C78515F46"
{
"SourcePath" = "8:Lib\\MonetDB5\\language.mal"
@@ -6379,26 +6399,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ED6B146829BC4379B3411F167C29313A"
- {
- "SourcePath" = "8:Lib\\MonetDB5\\sphinx.mal"
- "TargetName" = "8:sphinx.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "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}:_ED72E2EAC2394AFE8E6623DED755A97F"
{
"SourcePath" = "8:Lib\\MonetDB5\\lib_mal_io.dll"
@@ -6887,14 +6887,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{8ADA7659-346E-4147-B372-56BE0E158C4F}"
- "PackageCode" = "8:{C3B870F8-6407-4954-9D69-DF200BFCF514}"
+ "ProductCode" = "8:{449131CF-5503-495D-B080-3524A56BBB80}"
+ "PackageCode" = "8:{9AFCF549-8C52-4F91-85B1-F7717300CFF4}"
"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.9.14"
+ "ProductVersion" = "8:10.10.7"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff -r 6f6f6c5a6df1 -r ef4ce53d89cf
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Thu Oct 07
09:19:32 2010 +0200
+++ b/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Thu Oct 07
10:53:25 2010 +0200
@@ -327,6 +327,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_38466F82A40747AF81780BD1C1AD99AF"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_385110A6694E49348019C7D1DCCA55C8"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -723,12 +729,6 @@
}
"Entry"
{
- "MsmKey" = "8:_779E3B66C22F4D2F95A8138C019AF45C"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_77B47C1ED0DC4D83888D5BED0FC7F134"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2659,6 +2659,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_38466F82A40747AF81780BD1C1AD99AF"
+ {
+ "SourcePath" = "8:Lib\\MonetDB5\\autoload\\05_xml.mal"
+ "TargetName" = "8:05_xml.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_CBC2B495BACD4CA8A55E11008F8B563D"
+ "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"
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
