Changeset: 3146e61c4a4e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3146e61c4a4e
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
monetdb5/modules/mal/Makefile.ag
Branch: sciql
Log Message:
merge
diffs (258 lines):
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -15,6 +15,12 @@
{
"Entry"
{
+ "MsmKey" = "8:_00363761883944F7ADED42B5D2B6C2D7"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_03431EDC85094776AD217020CB3E26D4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -603,6 +609,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_A5295C984A5940219ACCC32C16C4E222"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_A72836DA12364DC487997DA532824457"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -855,6 +867,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_F1918A7E057C47B0B2068FEB52E210F2"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_F2F5DBA5F4ED478BB2F5C2CFF3E00856"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1007,6 +1025,26 @@
}
"File"
{
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_00363761883944F7ADED42B5D2B6C2D7"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\sciql.mal"
+ "TargetName" = "8:sciql.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}:_03431EDC85094776AD217020CB3E26D4"
{
"SourcePath" =
"8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\lib\\zdll.lib"
@@ -2947,6 +2985,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A5295C984A5940219ACCC32C16C4E222"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\29_array.sql"
+ "TargetName" = "8:29_array.sql"
+ "Tag" = "8:"
+ "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
+ "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}:_A72836DA12364DC487997DA532824457"
{
"SourcePath" = "8:lib\\monetdb5\\lib_json.dll"
@@ -3787,6 +3845,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F1918A7E057C47B0B2068FEB52E210F2"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\autoload\\41_sciql.mal"
+ "TargetName" = "8:41_sciql.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}:_F2F5DBA5F4ED478BB2F5C2CFF3E00856"
{
"SourcePath" = "8:lib\\monetdb5\\box.mal"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -231,6 +231,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_4206167BDEAF4E219F61028C974D1CA1"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_42AF6162C3DD4DC1A25D2CED3172CB1F"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -831,6 +837,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_E7CA14C84DE54D2B81D6B2669172AC32"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_E80B0549492B4D76B7EB93941A6BF89D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -879,6 +891,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_F46AFA016AB04E8482B1299631BE847A"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_F49ED0433C8C4B95A03BE721FB0A08C2"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1727,6 +1745,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4206167BDEAF4E219F61028C974D1CA1"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\29_array.sql"
+ "TargetName" = "8:29_array.sql"
+ "Tag" = "8:"
+ "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
+ "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}:_42AF6162C3DD4DC1A25D2CED3172CB1F"
{
"SourcePath" = "8:lib\\monetdb5\\run_memo.mal"
@@ -3707,6 +3745,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E7CA14C84DE54D2B81D6B2669172AC32"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\autoload\\41_sciql.mal"
+ "TargetName" = "8:41_sciql.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}:_E80B0549492B4D76B7EB93941A6BF89D"
{
"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win64-vs10\\bin\\libeay32.dll"
@@ -3867,6 +3925,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F46AFA016AB04E8482B1299631BE847A"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\sciql.mal"
+ "TargetName" = "8:sciql.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}:_F49ED0433C8C4B95A03BE721FB0A08C2"
{
"SourcePath" = "8:lib\\monetdb5\\identifier.mal"
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -80,7 +80,7 @@ headers_mal = {
txtsim.mal recycle.mal \
cluster.mal trader.mal \
tokenizer.mal zorder.mal sample.mal \
- calc.mal batcalc.mal batmtime.mal querylog.mal
+ calc.mal batcalc.mal batmtime.mal querylog.mal \
array.mx
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
