SF.net SVN: orm: [1153] trunk

[<mcu...@us...>]

Revision: 1153
          http://orm.svn.sourceforge.net/orm/?rev=1153&view=rev
Author:   mcurland
Date:     2007-10-14 23:33:06 -0700 (Sun, 14 Oct 2007)

Log Message:
-----------
Added DatabaseImport to build batch files. refs #305
Added additional build options. refs #337

Modified Paths:
--------------
    trunk/Main.proj
    trunk/TestSuites/TestSample/TestSample.csproj
    trunk/Tools/DatabaseImport/DatabaseImport.csproj

Added Paths:
-----------
    trunk/BuildAll.bat
    trunk/BuildReadme.txt
    trunk/FirstTimeBuildAll.bat
    trunk/Setup/ReadMe.txt

Added: trunk/BuildAll.bat
===================================================================
--- trunk/BuildAll.bat	                        (rev 0)
+++ trunk/BuildAll.bat	2007-10-15 06:33:06 UTC (rev 1153)
@@ -0,0 +1,9 @@
+@ECHO OFF
+SETLOCAL
+SET RootDir=%~dp0.
+CALL "%RootDir%\SetupEnvironment.bat" %*
+
+MSBuild.exe /nologo "%RootDir%\Setup.proj" %*
+MSBuild.exe /nologo "%RootDir%\Tests.proj" %*
+
+GOTO:EOF

Added: trunk/BuildReadme.txt
===================================================================
--- trunk/BuildReadme.txt	                        (rev 0)
+++ trunk/BuildReadme.txt	2007-10-15 06:33:06 UTC (rev 1153)
@@ -0,0 +1,20 @@
+The build is broken into several pieces to support multiple Visual Studio targeted versions and parts of the project.
+
+The batch files perform as follows:
+1) Build.bat builds all of the NORMA tools and extension projects. The test build helper, libary, and setup pieces are not built.
+
+2) BuildDevTools.bat builds the (relatively static) NUBuild MSBuild extensions and DSLTools directive processors. CalFled by FirstTimeBuild.bat
+
+3) FirstTimeBuild.bat should be run the first time the tool is used in a development environment. Does not do test or setup.
+
+4) BuildTests.bat builds testing tools and samples. Requires XML Diff Patch and nunit2.2.9 installation as discussed in README.txt in this directory.
+
+5) BuildSetup.bat builds everything included in setup. Requires install of WIX 3.0 as discussed in the README.txt file.
+
+6) BuildAll.bat builds everything except the development tools
+
+7) FirstTimeBuildAll.bat builds everything including the development tools
+
+To build for an Visual Studio 2008 (Orcas) version:
+Before running, set the following environment variable:
+set TargetVisualStudioVersion=v9.0

Added: trunk/FirstTimeBuildAll.bat
===================================================================
--- trunk/FirstTimeBuildAll.bat	                        (rev 0)
+++ trunk/FirstTimeBuildAll.bat	2007-10-15 06:33:06 UTC (rev 1153)
@@ -0,0 +1,14 @@
+@ECHO OFF
+SETLOCAL
+SET RootDir=%~dp0.
+CALL "%RootDir%\SetupEnvironment.bat" %*
+
+CALL "%RootDir%\BuildDevTools.bat" %*
+CALL "%RootDir%\BuildSetup.bat" %*
+CALL "%RootDir%\BuildTests.bat" %*
+
+ECHO.
+ECHO Running 'devenv.exe /RootSuffix "%VSRegistryRootSuffix%" /Setup'... This may take a few minutes...
+"%VSEnvironmentPath%" /RootSuffix "%VSRegistryRootSuffix%" /Setup
+
+GOTO:EOF

Modified: trunk/Main.proj
===================================================================
--- trunk/Main.proj	2007-10-15 06:29:06 UTC (rev 1152)
+++ trunk/Main.proj	2007-10-15 06:33:06 UTC (rev 1153)
@@ -9,6 +9,7 @@
 		<ProjectReference Include="RelationalModel\Dil.sln"/>
 		<ProjectReference Include="CustomProperties\CustomProperties.sln"/>
 		<ProjectReference Include="Tools\ORMCustomTool\ORMCustomTool.sln"/>
+		<ProjectReference Include="Tools\DatabaseImport\DatabaseImport.sln"/>
 	</ItemGroup>
 	<Import Project="Default.targets"/>
 </Project>
\ No newline at end of file

Added: trunk/Setup/ReadMe.txt
===================================================================
--- trunk/Setup/ReadMe.txt	                        (rev 0)
+++ trunk/Setup/ReadMe.txt	2007-10-15 06:33:06 UTC (rev 1153)
@@ -0,0 +1 @@
+See ..\README.txt for information on the WIX version required to build this project.
\ No newline at end of file

Modified: trunk/TestSuites/TestSample/TestSample.csproj
===================================================================
--- trunk/TestSuites/TestSample/TestSample.csproj	2007-10-15 06:29:06 UTC (rev 1152)
+++ trunk/TestSuites/TestSample/TestSample.csproj	2007-10-15 06:33:06 UTC (rev 1153)
@@ -11,6 +11,7 @@
     <AssemblyName>TestSample</AssemblyName>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\ORMPackage.snk</AssemblyOriginatorKeyFile>
+    <DisableAllPreprocessing>true</DisableAllPreprocessing>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Modified: trunk/Tools/DatabaseImport/DatabaseImport.csproj
===================================================================
--- trunk/Tools/DatabaseImport/DatabaseImport.csproj	2007-10-15 06:29:06 UTC (rev 1152)
+++ trunk/Tools/DatabaseImport/DatabaseImport.csproj	2007-10-15 06:33:06 UTC (rev 1153)
@@ -14,6 +14,7 @@
     <AssemblyOriginatorKeyFile>..\..\ORMPackage.snk</AssemblyOriginatorKeyFile>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
     <InstallInGac>true</InstallInGac>
+    <TrunkDir Condition=" '$(TrunkDir)' == '' ">$(MSBuildProjectDirectory)\..\..</TrunkDir>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,18 +37,19 @@
     <NoWarn>1607</NoWarn>
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
   <ItemGroup>
     <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Data, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Microsoft.VisualStudio.Data, Version=$(TargetVisualStudioAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <!-- As of Visual Studio 2008 Beta 2, Microsoft.VisualStudio.Shell.9.0 is still versioned as 2.0.0.0. -->
+    <Reference Include="Microsoft.VisualStudio.Shell$(TargetVisualStudioFrameworkAssemblySuffix), Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -97,7 +99,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Neumont\Neumont.Build.targets" />
   <PropertyGroup>
-    <PostBuildEvent>"$(SolutionDir)Install.bat" "$(OutputPath)"</PostBuildEvent>
-    <PreBuildEvent>"$(SolutionDir)..\..\VersionGenerator.exe"</PreBuildEvent>
+    <PreBuildEvent>"$(TrunkDir)\VersionGenerator.exe"</PreBuildEvent>
+    <PostBuildEvent>"$(MSBuildProjectDirectory)\Install.bat" "$(OutputPath)"</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.