Update of /cvsroot/monetdb/pathfinder/NT/MonetDB4-XQuery
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29129/NT/MonetDB4-XQuery
Modified Files:
Tag: PF_ROX
MonetDB4-XQuery.vdproj
Added Files:
Tag: PF_ROX
MonetDB4-XQuery64.sln MonetDB4-XQuery64.vdproj
Log Message:
propagated changes of Thursday May 22 2008 - Saturday May 24 2008
from the development trunk to the PF_ROX branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/22 - sjoerd:
runtime/pf_support.mx,1.299(Current_DailyBuild-24,Current_DailyBuild-23)
Fixed some type punning problems.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - sjoerd: NT/Makefile,1.20(Current_DailyBuild-24)
NT/MonetDB4-XQuery/MonetDB4-XQuery64.sln,1.1(Stable_DailyBuild-24,Current_DailyBuild-24)
NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj,1.1(Stable_DailyBuild-24,Current_DailyBuild-24)
Added 64 bit Windows installer.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - sjoerd:
NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj,1.3(Stable_DailyBuild-24,Current_DailyBuild-24)
Use registry to store where the product is installed.
This means you only get to choose the location in MonetDB-Common.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - tsheyar:
compiler/algebra/prop/prop_key.c,1.47(Current_DailyBuild-24)
-- some recently added property inference (for path steps) was to optimistic.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - tsheyar:
compiler/semantics/subtyping.c,1.48(Current_DailyBuild-24)
-- Complete the hierarchy information (integer <-> decimal) for disjoint types.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - lsidir: compiler/algebra/physical.c,1.69(Current_DailyBuild-24)
compiler/algebra/planner.c,1.62(Current_DailyBuild-24)
compiler/include/physical.h,1.45(Current_DailyBuild-24)
compiler/mil/milgen.brg,1.157(Current_DailyBuild-24)
compiler/mil/milprint.c,1.78(Current_DailyBuild-24)
implementation for id/idref...
works only for elements for now, but I wanted to commit before the branching.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- NEW FILE: MonetDB4-XQuery64.vdproj ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MonetDB4-XQuery64.sln ---
(This appears to be a binary file; contents omitted.)
Index: MonetDB4-XQuery.vdproj
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- MonetDB4-XQuery.vdproj 22 May 2008 08:48:28 -0000 1.2.2.2
+++ MonetDB4-XQuery.vdproj 24 May 2008 10:51:16 -0000 1.2.2.3
@@ -69,12 +69,6 @@
}
"Entry"
{
- "MsmKey" = "8:_6D2469641F8846369817F1CC2A9BCF4C"
- "OwnerKey" = "8:_F68A02B385C64980A45DD72D196AC354"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_6E70A0C24C34448EBEE52691D0DC6C56"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -123,6 +117,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_C945598F178A4E9E8445C6208BAF26BF"
+ "OwnerKey" = "8:_F68A02B385C64980A45DD72D196AC354"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_DC4B78BE13E445B289DE0E6D4BF130B6"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -232,7 +232,7 @@
"SourcePath" = "8:MXQserver.bat"
"TargetName" = "8:MXQserver.bat"
"Tag" = "8:"
- "Folder" = "8:_844C5FFEA23146E49C07BE04EBEAF0B0"
+ "Folder" = "8:_62B4F9E1E7294714A2D8C1CACF52BC43"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -292,7 +292,7 @@
"SourcePath" = "8:C:\\Program
Files\\Intel\\Compiler\\C++\\10.1.013\\IA32\\Bin\\libmmd.dll"
"TargetName" = "8:libmmd.dll"
"Tag" = "8:"
- "Folder" = "8:_AC71646495814C55B03F69019B5070C2"
+ "Folder" = "8:_D262855B92DE4EC89E4AAE66EAE05B3C"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -392,7 +392,7 @@
"SourcePath" = "8:pf.bat"
"TargetName" = "8:pf.bat"
"Tag" = "8:"
- "Folder" = "8:_844C5FFEA23146E49C07BE04EBEAF0B0"
+ "Folder" = "8:_62B4F9E1E7294714A2D8C1CACF52BC43"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -512,7 +512,7 @@
"SourcePath" = "8:C:\\libxml2-2.6.30.win32\\bin\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
- "Folder" = "8:_AC71646495814C55B03F69019B5070C2"
+ "Folder" = "8:_D262855B92DE4EC89E4AAE66EAE05B3C"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -532,7 +532,7 @@
"SourcePath" = "8:license.rtf"
"TargetName" = "8:license.rtf"
"Tag" = "8:"
- "Folder" = "8:_844C5FFEA23146E49C07BE04EBEAF0B0"
+ "Folder" = "8:_62B4F9E1E7294714A2D8C1CACF52BC43"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -552,7 +552,7 @@
"SourcePath" = "8:bin\\pf.exe"
"TargetName" = "8:pf.exe"
"Tag" = "8:"
- "Folder" = "8:_843C7B1529C64A6485D9DA6535451465"
+ "Folder" = "8:_1409D29AB00B4E23B9BF6A1BE15D4A84"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -572,7 +572,7 @@
"SourcePath" = "8:banner.bmp"
"TargetName" = "8:banner.bmp"
"Tag" = "8:"
- "Folder" = "8:_844C5FFEA23146E49C07BE04EBEAF0B0"
+ "Folder" = "8:_62B4F9E1E7294714A2D8C1CACF52BC43"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -612,7 +612,7 @@
"SourcePath" = "8:monetdb.ico"
"TargetName" = "8:monetdb.ico"
"Tag" = "8:"
- "Folder" = "8:_844C5FFEA23146E49C07BE04EBEAF0B0"
+ "Folder" = "8:_62B4F9E1E7294714A2D8C1CACF52BC43"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -644,17 +644,17 @@
{
}
}
-
"{3C67513D-01DD-4637-8A68-80971EB9504F}:_844C5FFEA23146E49C07BE04EBEAF0B0"
+
"{994432C3-9487-495D-8656-3E829A8DBDDE}:_62B4F9E1E7294714A2D8C1CACF52BC43"
{
- "DefaultLocation" = "8:[ProgramFilesFolder]MonetDB"
- "Name" = "8:#1925"
+ "DefaultLocation" = "8:[INSTALLPATH]"
+ "Name" = "8:Installation Folder"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
- "Property" = "8:TARGETDIR"
+ "Property" = "8:NEWPROPERTY1"
"Folders"
{
-
"{9EF0B969-E518-4E46-987F-47570745A589}:_843C7B1529C64A6485D9DA6535451465"
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_1409D29AB00B4E23B9BF6A1BE15D4A84"
{
"Name" = "8:bin"
"AlwaysCreate" = "11:FALSE"
@@ -665,7 +665,7 @@
{
}
}
-
"{9EF0B969-E518-4E46-987F-47570745A589}:_AC71646495814C55B03F69019B5070C2"
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_D262855B92DE4EC89E4AAE66EAE05B3C"
{
"Name" = "8:lib"
"AlwaysCreate" = "11:FALSE"
@@ -689,6 +689,18 @@
}
}
}
+
"{3C67513D-01DD-4637-8A68-80971EB9504F}:_844C5FFEA23146E49C07BE04EBEAF0B0"
+ {
+ "DefaultLocation" = "8:[ProgramFilesFolder]MonetDB"
+ "Name" = "8:#1925"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:TARGETDIR"
+ "Folders"
+ {
+ }
+ }
"{1525181F-901A-416C-8A58-119130FE478E}:_EA92FAC0EDD34A12A0B9BA9569650928"
{
"Name" = "8:#1919"
@@ -714,6 +726,13 @@
}
"LaunchCondition"
{
+
"{836E08B8-0285-4809-BA42-01DB6754A45D}:_3FD7B7E68B104AB89073D63FB7099D14"
+ {
+ "Name" = "8:Installation"
+ "Condition" = "8:INSTALLPATH"
+ "Message" = "8:MonetDB Common needs to be installed first."
+ "InstallUrl" = "8:http://monetdb.cwi.nl/";
+ }
"{836E08B8-0285-4809-BA42-01DB6754A45D}:_51126656D4214BA5A39FB99B90F06D71"
{
"Name" = "8:libbat exists"
@@ -734,7 +753,7 @@
"{39E1837C-0DB9-45A2-89C8-438377A77565}:_3CA0A6A4CF3647979994237E3E76052C"
{
"Name" = "8:Search for libbat"
- "Folder" = "8:[ProgramFilesFolder]"
+ "Folder" = "8:[INSTALLPATH]"
"Depth" = "2:2"
"FileName" = "8:libbat.dll"
"MinVesion" = "8:1.23.1.0"
@@ -749,10 +768,10 @@
"{39E1837C-0DB9-45A2-89C8-438377A77565}:_78C7989C8AF1468E964988AC44FE7D5E"
{
"Name" = "8:Search for libmonet"
- "Folder" = "8:[ProgramFilesFolder]"
+ "Folder" = "8:[INSTALLPATH]"
"Depth" = "2:2"
"FileName" = "8:libmonet.dll"
- "MinVesion" = "8:4.23.1"
+ "MinVesion" = "8:4.23.1.0"
"MaxVersion" = "8:"
"MinSize" = "8:"
"MaxSize" = "8:"
@@ -761,6 +780,14 @@
"Languages" = "8:"
"Property" = "8:LIBMONETEXISTS"
}
+
"{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_DC9B88F9DCC9487C88BF50A4CFCC50B2"
+ {
+ "Name" = "8:Search for Installation"
+ "Root" = "2:1"
+ "RegKey" = "8:Software\\[Manufacturer]\\MonetDB"
+ "Value" = "8:Path"
+ "Property" = "8:INSTALLPATH"
+ }
}
"MsiBootstrapper"
{
@@ -959,29 +986,6 @@
"Attributes" = "3:1"
"Dialogs"
{
-
"{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_3408BB797BDA4BAC896A6EAFDA8984B0"
- {
- "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:_DC4B78BE13E445B289DE0E6D4BF130B6"
- "UsePlugInResources" = "11:TRUE"
- }
- }
- }
"{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8E1D892EAF4D4B189F1B1E13E2B0B19E"
{
"Sequence" = "3:110"
@@ -1205,42 +1209,6 @@
}
}
}
-
"{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7FCCA8524CAD4E93B4750D228C679BE3"
- {
- "Sequence" = "3:200"
- "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:_DC4B78BE13E445B289DE0E6D4BF130B6"
- "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"
- }
- }
- }
"{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_909D4BF40E6847838B41D03F670FB6C9"
{
"Sequence" = "3:300"
@@ -1406,7 +1374,7 @@
}
"MergeModule"
{
-
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_6D2469641F8846369817F1CC2A9BCF4C"
+
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C945598F178A4E9E8445C6208BAF26BF"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
