Changeset: fd18971c5c12 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd18971c5c12 Modified Files: sql/ChangeLog.Jun2010 sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Branch: default Log Message:
Merge from Jun2010 branch: Added files needed to compile client programs. diffs (truncated from 1057 to 300 lines): diff -r 00e27361f6fe -r fd18971c5c12 sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Fri Jun 18 12:59:57 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Fri Jun 18 17:21:15 2010 +0200 @@ -1,3 +1,7 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Fri Jun 18 2010 Sjoerd Mullender <[email protected]> +- Added include and .lib files to Windows installers that are needed to + compile client programs. + diff -r 00e27361f6fe -r fd18971c5c12 sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj --- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Fri Jun 18 12:59:57 2010 +0200 +++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Fri Jun 18 17:21:15 2010 +0200 @@ -45,6 +45,12 @@ } "Entry" { + "MsmKey" = "8:_03431EDC85094776AD217020CB3E26D4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_03CDCA9DB4134189B5E9A3C46EF9A721" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -63,6 +69,12 @@ } "Entry" { + "MsmKey" = "8:_0607DD25BFA34B92B0BF84584D3D8BCA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_080DBBC49C9A477490259EEBEB0BFA5B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -111,6 +123,12 @@ } "Entry" { + "MsmKey" = "8:_0E831CE731C4468083874EADDAAFE7EB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_0FC984D6572040DDB1D7660556D8516A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -189,6 +207,12 @@ } "Entry" { + "MsmKey" = "8:_1AF238588D2D4EA5A416D48291406811" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1B25F91BB5CA446C93DB73BBA9D39FE3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -321,6 +345,12 @@ } "Entry" { + "MsmKey" = "8:_2CC8B012C0CB4DFC8F2223F62310125F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_2E8AAE22625E4C84B158C6BA3447547C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -471,6 +501,12 @@ } "Entry" { + "MsmKey" = "8:_510F78343E3A45E2A6AA55AE6D608E78" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_52DCEC5806254D3F9246489B9C5DFC27" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -669,6 +705,12 @@ } "Entry" { + "MsmKey" = "8:_75A080633F994EA59ED26A025CD34817" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_76A73E230821469D8E4041E5E53D110C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -789,6 +831,12 @@ } "Entry" { + "MsmKey" = "8:_8229F1B1B1194A7683AA5E43B68C3229" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_843D7AFBE51442D4B5FDF929B1183805" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -975,6 +1023,12 @@ } "Entry" { + "MsmKey" = "8:_A3D31DA50E0F4AE1873E390D5B7F1F33" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_A5161550D63E435591E71610B1975E8C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1059,6 +1113,12 @@ } "Entry" { + "MsmKey" = "8:_BA22F04D137D421199EB04EE1D228A8F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_BA63278F2146429BBC880C3A1F361D9A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1197,6 +1257,12 @@ } "Entry" { + "MsmKey" = "8:_CA3CFDD1291E474EAE85329E4C5E5D45" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_CB3C9EC9B4FF49E9815AC97E05BB8A46" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1425,6 +1491,12 @@ } "Entry" { + "MsmKey" = "8:_EC51016BC5DF41DC910CAB27C8819B30" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_EEF98D12FDE24A649066728F6F52521C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1683,6 +1755,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4" + { + "SourcePath" = "8:C:\\zlib-1.2.3.win32\\lib\\zlib1.lib" + "TargetName" = "8:zlib1.lib" + "Tag" = "8:" + "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" + "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}:_03CDCA9DB4134189B5E9A3C46EF9A721" { "SourcePath" = "8:Lib\\MonetDB5\\chopper.mal" @@ -1743,6 +1835,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0607DD25BFA34B92B0BF84584D3D8BCA" + { + "SourcePath" = "8:C:\\openssl-0.9.8k.win32\\lib\\libeay32.lib" + "TargetName" = "8:libeay32.lib" + "Tag" = "8:" + "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" + "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}:_080DBBC49C9A477490259EEBEB0BFA5B" { "SourcePath" = "8:Lib\\MonetDB5\\remote.mal" @@ -1903,6 +2015,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0E831CE731C4468083874EADDAAFE7EB" + { + "SourcePath" = "8:include\\MonetDB\\mapilib\\Mapi.h" + "TargetName" = "8:Mapi.h" + "Tag" = "8:" + "Folder" = "8:_65C69A604EBF47F9AFCB6FD19084ADC8" + "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}:_0FC984D6572040DDB1D7660556D8516A" { "SourcePath" = "8:Lib\\MonetDB5\\algebraExtensions.mal" @@ -2163,6 +2295,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1AF238588D2D4EA5A416D48291406811" + { + "SourcePath" = "8:C:\\iconv-1.11.1.win32\\lib\\iconv.lib" + "TargetName" = "8:iconv.lib" + "Tag" = "8:" + "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" + "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}:_1B25F91BB5CA446C93DB73BBA9D39FE3" { "SourcePath" = "8:Lib\\MonetDB5\\recycle.mal" @@ -2603,6 +2755,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2CC8B012C0CB4DFC8F2223F62310125F" + { + "SourcePath" = "8:C:\\libxml2-2.6.32+.win32\\lib\\libxml2.lib" + "TargetName" = "8:libxml2.lib" + "Tag" = "8:" + "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" + "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" _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
