Update of /cvsroot/monetdb/sql/NT/MonetDB5-SQL
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9646/NT/MonetDB5-SQL
Modified Files:
MonetDB5-SQL64.vdproj
Log Message:
Use registry to check version numbers of packages.
U MonetDB5-SQL64.vdproj
Index: MonetDB5-SQL64.vdproj
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- MonetDB5-SQL64.vdproj 28 Oct 2008 16:58:20 -0000 1.7
+++ MonetDB5-SQL64.vdproj 30 Oct 2008 16:09:58 -0000 1.8
@@ -63,12 +63,6 @@
}
"Entry"
{
- "MsmKey" = "8:_95F72B67BA4640B581850433C2CB5C31"
- "OwnerKey" = "8:_B70620E23C8347019C6BB3934DB1FAF0"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_A84919C97283494D8F2BAA3126ACE616"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -87,6 +81,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_B97B25C9CBED419A9E8561913346C99B"
+ "OwnerKey" = "8:_B70620E23C8347019C6BB3934DB1FAF0"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_B9A143932D88475C8F65CA5BF2359F32"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -720,16 +720,16 @@
{
"{836E08B8-0285-4809-BA42-01DB6754A45D}:_51126656D4214BA5A39FB99B90F06D71"
{
- "Name" = "8:libbat exists"
- "Condition" = "8:LIBBATEXISTS"
- "Message" = "8:MonetDB-Common64 needs to be installed first."
+ "Name" = "8:ClientsVersion"
+ "Condition" = "8:CLIENTSVERSION >= \"0.24.0\""
+ "Message" = "8:A newer version of MonetDB-Clients is needed."
"InstallUrl" = "8:http://monetdb.cwi.nl/";
}
"{836E08B8-0285-4809-BA42-01DB6754A45D}:_9F424156C8744B5FBAB87DFF148B9813"
{
- "Name" = "8:libMapi exists"
- "Condition" = "8:LIBMAPIEXISTS"
- "Message" = "8:MonetDB Clients needs to be installed first."
+ "Name" = "8:MonetDB5Version"
+ "Condition" = "8:MONETDB5VERSION >= \"5.7.0\""
+ "Message" = "8:A newer version of MonetDB5-Server is needed."
"InstallUrl" = "8:http://monetdb.cwi.nl/";
}
"{836E08B8-0285-4809-BA42-01DB6754A45D}:_B11C7438D9A14136AE8FE10CBC8BAACF"
@@ -739,45 +739,31 @@
"Message" = "8:MonetDB Common needs to be installed first."
"InstallUrl" = "8:http://monetdb.cwi.nl/";
}
-
"{836E08B8-0285-4809-BA42-01DB6754A45D}:_D99FFD5A11A248C49529ACFF408005C1"
+
"{836E08B8-0285-4809-BA42-01DB6754A45D}:_ECD039D30FAA45BDB4DF19C898EE337A"
{
- "Name" = "8:libmonetdb5 exists"
- "Condition" = "8:LIBMONETDB5EXISTS"
- "Message" = "8:MonetDB5 Server needs to be installed first."
+ "Name" = "8:CommonVersion"
+ "Condition" = "8:COMMONVERSION >= \"1.25.0\""
+ "Message" = "8:A newer version of MonetDB-Common is needed."
"InstallUrl" = "8:http://monetdb.cwi.nl/";
}
}
"Locator"
{
-
"{39E1837C-0DB9-45A2-89C8-438377A77565}:_167A60F48BA446AABCC390191B6B7852"
+
"{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_25C61541FF1D4C5DBA71CA3C1B46C57E"
{
- "Name" = "8:Search for libMapi"
- "Folder" = "8:[INSTALLPATH]"
- "Depth" = "2:2"
- "FileName" = "8:libMapi.dll"
- "MinVesion" = "8:1.24.0.0"
- "MaxVersion" = "8:"
- "MinSize" = "8:"
- "MaxSize" = "8:"
- "MinDate" = "8:"
- "MaxDate" = "8:"
- "Languages" = "8:"
- "Property" = "8:LIBMAPIEXISTS"
+ "Name" = "8:Search for MonetDB Clients"
+ "Root" = "2:1"
+ "RegKey" = "8:Software\\[Manufacturer]\\MonetDB"
+ "Value" = "8:ClientsVersion"
+ "Property" = "8:CLIENTSVERSION"
}
-
"{39E1837C-0DB9-45A2-89C8-438377A77565}:_3CA0A6A4CF3647979994237E3E76052C"
+
"{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_459E17E4E5684F1584303B0DB1DC3F85"
{
- "Name" = "8:Search for libbat"
- "Folder" = "8:[INSTALLPATH]"
- "Depth" = "2:2"
- "FileName" = "8:libbat.dll"
- "MinVesion" = "8:1.25.0.0"
- "MaxVersion" = "8:"
- "MinSize" = "8:"
- "MaxSize" = "8:"
- "MinDate" = "8:"
- "MaxDate" = "8:"
- "Languages" = "8:"
- "Property" = "8:LIBBATEXISTS"
+ "Name" = "8:Search for MonetDB Common"
+ "Root" = "2:1"
+ "RegKey" = "8:Software\\[Manufacturer]\\MonetDB"
+ "Value" = "8:CommonVersion"
+ "Property" = "8:COMMONVERSION"
}
"{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_A9DA7BB0A25B4238B68B273D1959248B"
{
@@ -787,20 +773,13 @@
"Value" = "8:Path"
"Property" = "8:INSTALLPATH"
}
-
"{39E1837C-0DB9-45A2-89C8-438377A77565}:_E6F9181C66E842448A503B0BCF12B59B"
+
"{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_F80960BCE04F4F039593B03F6925D0A0"
{
- "Name" = "8:Search for libmonetdb5"
- "Folder" = "8:[INSTALLPATH]"
- "Depth" = "2:2"
- "FileName" = "8:libmonetdb5.dll"
- "MinVesion" = "8:5.7.0.0"
- "MaxVersion" = "8:"
- "MinSize" = "8:"
- "MaxSize" = "8:"
- "MinDate" = "8:"
- "MaxDate" = "8:"
- "Languages" = "8:"
- "Property" = "8:LIBMONETDB5EXISTS"
+ "Name" = "8:Search for MonetDB5 Server"
+ "Root" = "2:1"
+ "RegKey" = "8:Software\\[Manufacturer]\\MonetDB"
+ "Value" = "8:MonetDB5Version"
+ "Property" = "8:MONETDB5VERSION"
}
}
"MsiBootstrapper"
@@ -861,6 +840,28 @@
"Transitive" = "11:FALSE"
"Keys"
{
+
"{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_49E12507CBD94CD38520B0741F5000D3"
+ {
+ "Name" = "8:MonetDB"
+ "Condition" = "8:"
+ "AlwaysCreate" = "11:FALSE"
+ "DeleteAtUninstall" = "11:FALSE"
+ "Transitive" = "11:FALSE"
+ "Keys"
+ {
+ }
+ "Values"
+ {
+
"{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_726106A7E1CD456E93FA940A72385BD1"
+ {
+ "Name" = "8:SQL5Version"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:2.25.0"
+ }
+ }
+ }
}
"Values"
{
@@ -1388,11 +1389,11 @@
}
"MergeModule"
{
-
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_95F72B67BA4640B581850433C2CB5C31"
+
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B70620E23C8347019C6BB3934DB1FAF0"
{
"UseDynamicProperties" = "11:TRUE"
- "IsDependency" = "11:TRUE"
- "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86_x64.msm"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC80_CRT_x86_x64.msm"
"Properties"
{
}
@@ -1402,11 +1403,11 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
-
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B70620E23C8347019C6BB3934DB1FAF0"
+
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B97B25C9CBED419A9E8561913346C99B"
{
"UseDynamicProperties" = "11:TRUE"
- "IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC80_CRT_x86_x64.msm"
+ "IsDependency" = "11:TRUE"
+ "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86_x64.msm"
"Properties"
{
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
