Changeset: 862827162498 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=862827162498
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer32/cv64-32.sh
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/installer64/cv32-64.sh
configure.ag
gdk/gdk.h
gdk/gdk_batop.c
gdk/gdk_select.c
gdk/gdk_unique.c
monetdb5/extras/rdf/rdf_shredder.c
monetdb5/modules/kernel/aggr.c
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/pcre.c
tools/merovingian/daemon/client.c
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
merge
diffs (truncated from 7581 to 300 lines):
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -15,12 +15,6 @@
{
"Entry"
{
- "MsmKey" = "8:_11741B73503C4B6AA61599A42BA38851"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_14F4BC1A7F54458D91CFA4A0BD174604"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -63,7 +57,7 @@
}
"Entry"
{
- "MsmKey" = "8:_64A4AC448DEF46D89377E6F79019D632"
+ "MsmKey" = "8:_779449EF5BAD4B068A50802402E52278"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -75,6 +69,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_B1B1C0011D7945F892A77F529772EA72"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_BC1CD3A227FA4EB7B035DFA62EF4D82C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -208,26 +208,6 @@
}
"File"
{
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_11741B73503C4B6AA61599A42BA38851"
- {
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\libeay32.dll"
- "TargetName" = "8:libeay32.dll"
- "Tag" = "8:"
- "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
- "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}:_14F4BC1A7F54458D91CFA4A0BD174604"
{
"SourcePath" = "8:monetdb.ico"
@@ -348,10 +328,10 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_64A4AC448DEF46D89377E6F79019D632"
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\ssleay32.dll"
- "TargetName" = "8:ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\libeay32.dll"
+ "TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
"Condition" = "8:"
@@ -388,6 +368,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72"
+ {
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\ssleay32.dll"
+ "TargetName" = "8:ssleay32.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
+ "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}:_BC1CD3A227FA4EB7B035DFA62EF4D82C"
{
"SourcePath" = "8:lib\\libstream.dll"
@@ -566,8 +566,8 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{4E161B98-9FC8-4512-97D8-EA76C354DA4D}"
- "PackageCode" = "8:{D7B51DE5-F620-464F-89E1-5DE3D9103AB2}"
+ "ProductCode" = "8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"
+ "PackageCode" = "8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"
"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
@@ -1207,7 +1207,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x86.msm"
+ "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x86.msm"
"Properties"
{
}
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -425,8 +425,8 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{A61BE52A-99A2-4503-BB5B-3837B0708862}"
- "PackageCode" = "8:{5F8AB146-C5BB-4961-95DE-9848D2AF533A}"
+ "ProductCode" = "8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"
+ "PackageCode" = "8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
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,12 +15,24 @@
{
"Entry"
{
+ "MsmKey" = "8:_00B0B80DC7654AB9A6B0E65404051359"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_03431EDC85094776AD217020CB3E26D4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
+ "MsmKey" = "8:_03B895AFEB174D65990EBB22D5BA9751"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_04BC8A80401A4DD88F4B11ADECEC7117"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -33,7 +45,13 @@
}
"Entry"
{
- "MsmKey" = "8:_071834FD53814185A888F1EC6A4025E2"
+ "MsmKey" = "8:_08795D45D2654619B8ADE4F57F9DF48A"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_08FE3FD8B70B485EA4405D5FA91E1F1D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -51,7 +69,13 @@
}
"Entry"
{
- "MsmKey" = "8:_0DF0975111624D2AB740CA6833E66215"
+ "MsmKey" = "8:_0D89A4DB4F994D099C13CBFBBCF06A43"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_0E56D43B0AA940B2A39CD5C933BECE5C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -63,13 +87,7 @@
}
"Entry"
{
- "MsmKey" = "8:_109EBAB5786E465FB15408375015A8D3"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_128044D658F44F5B8D20E530D93D3DBD"
+ "MsmKey" = "8:_1174853D3D9F4EDEAF358D86741B87F7"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -81,19 +99,37 @@
}
"Entry"
{
- "MsmKey" = "8:_17DB9CADC23C47BE854BDCE45693602C"
+ "MsmKey" = "8:_14F914914617485AACBCFF39FA5F646B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_19415106E4B1432D975EE7A145C81565"
+ "MsmKey" = "8:_15E8239F241546D8ACD6C527E322C0CD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_194B3297FB234BF180CEC8201CA42B7C"
+ "MsmKey" = "8:_16E3FD1FDF22415A99B8FE81A6231248"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_17D9C20FFF4345058C198380646E66B8"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_18D048C1AFBB4F709307E109E01C05BA"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_192FFF7D660645789A6A0CD24AA61909"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -111,13 +147,19 @@
}
"Entry"
{
- "MsmKey" = "8:_1D83F06AB65540BE9769A6D308F99623"
+ "MsmKey" = "8:_1D5ACA855B234C93B22861A37A1B4663"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1FCA305559B8494AAA8E07011A5752BC"
+ "MsmKey" = "8:_1F84594549F24A96A4EF15ED9EC7184F"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_1FE6775741C5492FA9A67BAF75C9F430"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -129,19 +171,19 @@
}
"Entry"
{
+ "MsmKey" = "8:_1FEF2B135F2C4C9FA8C8E7CB566F8372"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_210ACB4F1EA444B4B72F5B60E9953FEE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_23E800B98466457F844942F753998D3E"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_24E9AD62F38141BCB1BDA389463A1ADF"
+ "MsmKey" = "8:_243ACA00391A4A0BA72D3D74EDFF7EA1"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
