Update of /cvsroot/monetdb/geom/NT/MonetDB5-Geom
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18357/NT/MonetDB5-Geom
Modified Files:
Tag: Geom_0-4
MonetDB5-Geom-Module.vdproj
Log Message:
Require installation of M5/SQL and use install path that it's installation
registered.
U MonetDB5-Geom-Module.vdproj
Index: MonetDB5-Geom-Module.vdproj
===================================================================
RCS file:
/cvsroot/monetdb/geom/NT/MonetDB5-Geom/Attic/MonetDB5-Geom-Module.vdproj,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- MonetDB5-Geom-Module.vdproj 23 Jun 2008 14:35:03 -0000 1.1.2.1
+++ MonetDB5-Geom-Module.vdproj 23 Jun 2008 15:48:56 -0000 1.1.2.2
@@ -27,26 +27,26 @@
}
"Entry"
{
- "MsmKey" = "8:_819BD8650A494CC68BD064E23EF621BB"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_6ECB09E9F039488695CDFE036BFD88D3"
+ "OwnerKey" = "8:_819BD8650A494CC68BD064E23EF621BB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B44E4DBF28214C5F8E146367ED28914D"
+ "MsmKey" = "8:_819BD8650A494CC68BD064E23EF621BB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D147424A3FAE4B65A5E6354CD1874429"
+ "MsmKey" = "8:_B44E4DBF28214C5F8E146367ED28914D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_DF4CF190F26247D3B373D0DDA5E26E9C"
- "OwnerKey" = "8:_819BD8650A494CC68BD064E23EF621BB"
+ "MsmKey" = "8:_D147424A3FAE4B65A5E6354CD1874429"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -142,7 +142,7 @@
"SourcePath" = "8:banner.bmp"
"TargetName" = "8:banner.bmp"
"Tag" = "8:"
- "Folder" = "8:_D9A7267FC9784D8BBD3CBC6EC1754DBE"
+ "Folder" = "8:_43F633204BF7468685D229A7194CCD26"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -182,7 +182,7 @@
"SourcePath" = "8:license.rtf"
"TargetName" = "8:license.rtf"
"Tag" = "8:"
- "Folder" = "8:_D9A7267FC9784D8BBD3CBC6EC1754DBE"
+ "Folder" = "8:_43F633204BF7468685D229A7194CCD26"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -254,17 +254,17 @@
{
}
}
-
"{3C67513D-01DD-4637-8A68-80971EB9504F}:_D9A7267FC9784D8BBD3CBC6EC1754DBE"
+
"{994432C3-9487-495D-8656-3E829A8DBDDE}:_43F633204BF7468685D229A7194CCD26"
{
- "DefaultLocation" =
"8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"
- "Name" = "8:#1925"
+ "DefaultLocation" = "8:[TARGETDIR]"
+ "Name" = "8:Installation Folder"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
- "Property" = "8:TARGETDIR"
+ "Property" = "8:NEWPROPERTY1"
"Folders"
{
-
"{9EF0B969-E518-4E46-987F-47570745A589}:_A3C9BE5CA72B42628868618D180581DA"
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_4D9CE65EDD774551869CFD46B59B4F9E"
{
"Name" = "8:lib"
"AlwaysCreate" = "11:FALSE"
@@ -286,7 +286,7 @@
}
}
}
-
"{9EF0B969-E518-4E46-987F-47570745A589}:_FE7DB96AFEDA4F2DA12EE423A19C2C50"
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_D32725D6DFA64301BDD999A0846B9D3B"
{
"Name" = "8:share"
"AlwaysCreate" = "11:FALSE"
@@ -321,12 +321,39 @@
}
}
}
+
"{3C67513D-01DD-4637-8A68-80971EB9504F}:_D9A7267FC9784D8BBD3CBC6EC1754DBE"
+ {
+ "DefaultLocation" =
"8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"
+ "Name" = "8:#1925"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:TARGETDIR"
+ "Folders"
+ {
+ }
+ }
}
"LaunchCondition"
{
+
"{836E08B8-0285-4809-BA42-01DB6754A45D}:_E94FFBB7E2614092B06A936B1C2DF05F"
+ {
+ "Name" = "8:Installation"
+ "Condition" = "8:INSTALLPATH"
+ "Message" = "8:MonetDB5-SQL needs to be installed first."
+ "InstallUrl" = "8:http://monetdb.cwi.nl/";
+ }
}
"Locator"
{
+
"{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_7BEB88D3E7614867A7733A462578FA68"
+ {
+ "Name" = "8:Search for Installation Path"
+ "Root" = "2:1"
+ "RegKey" = "8:Software\\[Manufacturer]\\MonetDB5"
+ "Value" = "8:InstallPath"
+ "Property" = "8:INSTALLPATH"
+ }
}
"MsiBootstrapper"
{
@@ -669,29 +696,6 @@
}
}
}
-
"{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_92663213ADA442D0B823AA4CBE5B13D2"
- {
- "Sequence" = "3:200"
- "DisplayName" = "8:Installation Folder"
- "UseDynamicProperties" = "11:TRUE"
- "IsDependency" = "11:FALSE"
- "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"
- "Properties"
- {
- "BannerBitmap"
- {
- "Name" = "8:BannerBitmap"
- "DisplayName" = "8:#1001"
- "Description" = "8:#1101"
- "Type" = "3:8"
- "ContextData" = "8:Bitmap"
- "Attributes" = "3:4"
- "Setting" = "3:2"
- "Value" = "8:_1FE7B02CBBA5493DA5E90CC441A198FC"
- "UsePlugInResources" = "11:TRUE"
- }
- }
- }
}
}
"{DF760B10-853B-4699-99F2-AFF7185B4A62}:_94A3BAA182D44C3C9397BFF8D425243A"
@@ -821,42 +825,6 @@
}
}
}
-
"{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_6049803239C44F2E9FD1895FA187E5B7"
- {
- "Sequence" = "3:400"
- "DisplayName" = "8:Installation Folder"
- "UseDynamicProperties" = "11:TRUE"
- "IsDependency" = "11:FALSE"
- "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
- "Properties"
- {
- "BannerBitmap"
- {
- "Name" = "8:BannerBitmap"
- "DisplayName" = "8:#1001"
- "Description" = "8:#1101"
- "Type" = "3:8"
- "ContextData" = "8:Bitmap"
- "Attributes" = "3:4"
- "Setting" = "3:2"
- "Value" = "8:_1FE7B02CBBA5493DA5E90CC441A198FC"
- "UsePlugInResources" = "11:TRUE"
- }
- "InstallAllUsersVisible"
- {
- "Name" = "8:InstallAllUsersVisible"
- "DisplayName" = "8:#1059"
- "Description" = "8:#1159"
- "Type" = "3:5"
- "ContextData" = "8:1;True=1;False=0"
- "Attributes" = "3:0"
- "Setting" = "3:0"
- "Value" = "3:1"
- "DefaultValue" = "3:1"
- "UsePlugInResources" = "11:TRUE"
- }
- }
- }
}
}
"{DF760B10-853B-4699-99F2-AFF7185B4A62}:_B83ECAF64BD24D52A04C91609CC27FC4"
@@ -958,11 +926,11 @@
}
"MergeModule"
{
-
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_819BD8650A494CC68BD064E23EF621BB"
+
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_6ECB09E9F039488695CDFE036BFD88D3"
{
"UseDynamicProperties" = "11:TRUE"
- "IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC80_CRT_x86.msm"
+ "IsDependency" = "11:TRUE"
+ "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm"
"Properties"
{
}
@@ -972,11 +940,11 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
-
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_DF4CF190F26247D3B373D0DDA5E26E9C"
+
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_819BD8650A494CC68BD064E23EF621BB"
{
"UseDynamicProperties" = "11:TRUE"
- "IsDependency" = "11:TRUE"
- "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC80_CRT_x86.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
