Update of /cvsroot/monetdb/sql/NT/MonetDB5-SQL64
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14068/NT/MonetDB5-SQL64

Modified Files:
        MonetDB5-SQL-Installer.vdproj 
Log Message:
propagated changes of Monday Jun 23 2008 - Tuesday Jun 24 2008
from the SQL_2-24 branch to the development trunk

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/23 - sjoerd: RunMserver.bat.in,1.8.4.1 NT/Makefile,1.25.2.1
Cleanup.
M5 is default if present, else M4 is default.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/23 - sjoerd: NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj,1.19.2.7
        NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj,1.9.2.7
Register installation path.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/24 - sjoerd: NT/MonetDB4-SQL/MonetDB4-SQL-Installer.vdproj,1.11.2.7
        NT/MonetDB4-SQL64/MonetDB4-SQL-Installer.vdproj,1.6.2.8
        NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj,1.19.2.8
        NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj,1.9.2.8
Updated version number.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: MonetDB5-SQL-Installer.vdproj
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- MonetDB5-SQL-Installer.vdproj       20 Jun 2008 12:32:43 -0000      1.15
+++ MonetDB5-SQL-Installer.vdproj       24 Jun 2008 07:59:45 -0000      1.16
@@ -417,6 +417,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_5FE124196DDA4CB786A8FE7E1CFF3D9E"
+        "OwnerKey" = "8:_819BD8650A494CC68BD064E23EF621BB"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_62D9E6C26DE042AEBA1C4D8010D28968"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -1233,12 +1239,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_FA4951D7DB4A4E0AB27E785ED0B94A3A"
-        "OwnerKey" = "8:_819BD8650A494CC68BD064E23EF621BB"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_FB2B080C4FCA4ABBA88B5A079A652B31"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -5728,14 +5728,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB5"
-        "ProductCode" = "8:{14F63D7C-E93C-450B-B970-72B1DD03160D}"
-        "PackageCode" = "8:{0081EB3F-1ACB-4F7E-9044-44188EBD75C1}"
+        "ProductCode" = "8:{A404C335-9651-41A7-8FCE-FC3EC4398B93}"
+        "PackageCode" = "8:{85F19EF0-274B-413D-BD44-5F305E1FA45D}"
         "UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:8.6.19"
+        "ProductVersion" = "8:8.6.24"
         "Manufacturer" = "8:CWI"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
@@ -5778,6 +5778,28 @@
                             "Transitive" = "11:FALSE"
                                 "Keys"
                                 {
+                                    
"{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_B475B5A7775349C2995452AFFF826F66"
+                                    {
+                                    "Name" = "8:MonetDB5"
+                                    "Condition" = "8:"
+                                    "AlwaysCreate" = "11:FALSE"
+                                    "DeleteAtUninstall" = "11:FALSE"
+                                    "Transitive" = "11:FALSE"
+                                        "Keys"
+                                        {
+                                        }
+                                        "Values"
+                                        {
+                                            
"{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3CB8DAE491374070BAEAEBC47B2108B4"
+                                            {
+                                            "Name" = "8:InstallPath"
+                                            "Condition" = "8:"
+                                            "Transitive" = "11:FALSE"
+                                            "ValueTypes" = "3:2"
+                                            "Value" = "8:[TARGETDIR]"
+                                            }
+                                        }
+                                    }
                                 }
                                 "Values"
                                 {
@@ -6392,11 +6414,11 @@
         }
         "MergeModule"
         {
-            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_819BD8650A494CC68BD064E23EF621BB"
+            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_5FE124196DDA4CB786A8FE7E1CFF3D9E"
             {
             "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"
                 {
                 }
@@ -6406,11 +6428,11 @@
             "Feature" = "8:"
             "IsolateTo" = "8:"
             }
-            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_FA4951D7DB4A4E0AB27E785ED0B94A3A"
+            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_819BD8650A494CC68BD064E23EF621BB"
             {
             "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\\Common Files\\Merge 
Modules\\Microsoft_VC80_CRT_x86_x64.msm"
                 "Properties"
                 {
                 }


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to