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

Modified Files:
      Tag: SQL_2-18
        MonetDB5-Installer.sln MonetDB5-Installer.vdproj 
Log Message:
Move the global rules.msc to buildtools/conf.
Created a centralized winconfig.h which is included by all *config.h files on 
Windows (for ease of maintenance).
On 64 bit Windows, use 32 bit OIDs.

Index: MonetDB5-Installer.sln
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/MonetDB5-SQL/MonetDB5-Installer.sln,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- MonetDB5-Installer.sln      26 Jan 2007 19:42:50 -0000      1.2
+++ MonetDB5-Installer.sln      8 Jun 2007 11:28:33 -0000       1.2.2.1
@@ -1,21 +1,19 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MonetDB5-Installer", 
"MonetDB5-Installer.vdproj", "{E5EBAB1B-6991-4ACC-8DBD-36E77E3D7F45}"
-       ProjectSection(ProjectDependencies) = postProject
-       EndProjectSection
 EndProject
 Global
-       GlobalSection(SolutionConfiguration) = preSolution
-               Debug = Debug
-               Release = Release
-       EndGlobalSection
-       GlobalSection(ProjectConfiguration) = postSolution
-               {E5EBAB1B-6991-4ACC-8DBD-36E77E3D7F45}.Debug.ActiveCfg = Debug
-               {E5EBAB1B-6991-4ACC-8DBD-36E77E3D7F45}.Debug.Build.0 = Debug
-               {E5EBAB1B-6991-4ACC-8DBD-36E77E3D7F45}.Release.ActiveCfg = 
Release
-               {E5EBAB1B-6991-4ACC-8DBD-36E77E3D7F45}.Release.Build.0 = Release
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Debug|Default = Debug|Default
+               Release|Default = Release|Default
        EndGlobalSection
-       GlobalSection(ExtensibilityGlobals) = postSolution
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution
+               {E5EBAB1B-6991-4ACC-8DBD-36E77E3D7F45}.Debug|Default.ActiveCfg 
= Debug
+               {E5EBAB1B-6991-4ACC-8DBD-36E77E3D7F45}.Debug|Default.Build.0 = 
Debug
+               
{E5EBAB1B-6991-4ACC-8DBD-36E77E3D7F45}.Release|Default.ActiveCfg = Release
+               {E5EBAB1B-6991-4ACC-8DBD-36E77E3D7F45}.Release|Default.Build.0 
= Release
        EndGlobalSection
-       GlobalSection(ExtensibilityAddIns) = postSolution
+       GlobalSection(SolutionProperties) = preSolution
+               HideSolutionNode = FALSE
        EndGlobalSection
 EndGlobal

Index: MonetDB5-Installer.vdproj
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/MonetDB5-SQL/MonetDB5-Installer.vdproj,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- MonetDB5-Installer.vdproj   5 Jun 2007 18:03:33 -0000       1.3.2.2
+++ MonetDB5-Installer.vdproj   8 Jun 2007 11:28:36 -0000       1.3.2.3
@@ -1,7 +1,7 @@
 "DeployProject"
 {
-"VSVersion" = "3:701"
-"ProjectType" = "8:{2C2AF0D9-9B47-4FE5-BEF2-169778172667}"
+"VSVersion" = "3:800"
+"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
 "IsWebType" = "8:FALSE"
 "ProjectName" = "8:MonetDB5-Installer"
 "LanguageId" = "3:1033"
@@ -237,31 +237,31 @@
         }
[...2465 lines suppressed...]
             "IsDependency" = "11:FALSE"
-            "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge 
Modules\\VC_User_CRT71_RTL_X86_---.msm"
+            "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge 
Modules\\Microsoft_VC80_CRT_x86_x64.msm"
+                "Properties"
+                {
+                }
+            "LanguageId" = "3:0"
+            "Exclude" = "11:FALSE"
+            "Folder" = "8:"
+            "Feature" = "8:"
+            "IsolateTo" = "8:"
+            }
+            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_3F5BB8BD50184916AB27F2CA8796488B"
+            {
+            "UseDynamicProperties" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86_x64.msm"
                 "Properties"
                 {
                 }


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to