Skip to content

Commit

Permalink
integrated solutions.build.nant script into main build
Browse files Browse the repository at this point in the history 
fixed northwind example msbuild
  • Loading branch information
@eeichinger
eeichinger committed Aug 3, 2009
1 parent c31963a commit 8fd3506
Show file tree
Hide file tree
Showing 11 changed files with 337 additions and 335 deletions.
6 changes: 0 additions & 6 deletions Spring.Net.2005.sln
View file
Expand Up @@ -84,12 +84,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.2005",
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.Integration.Tests.2005", "test\Spring\Spring.Data.NHibernate.Integration.Tests\Spring.Data.NHibernate.Integration.Tests.2005.csproj", "{4A07E150-ED90-407C-8CAD-4760444DDFD9}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate12.2005", "src\Spring\Spring.Data.NHibernate12\Spring.Data.NHibernate12.2005.csproj", "{90F2D070-6F98-4926-A626-BD7A6071D6D9}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Expand Down
394 changes: 183 additions & 211 deletions Spring.build
View file

Large diffs are not rendered by default.

214 changes: 117 additions & 97 deletions build-support/solutions.build.nant
View file
Expand Up @@ -19,107 +19,127 @@ Rebuilding Solutions using Nant and "solutions.build":
-->
<project name="Spring.NET Examples" default="RebuildAllSolutions">

<property name="vs2003.install.dir.key" value="SOFTWARE\Microsoft\VisualStudio\7.1\InstallDir"/>
<readregistry property="vs2003.install.dir" key="${vs2003.install.dir.key}" hive="LocalMachine" failonerror="false"/>
<property name="devenv11.exe" value="${vs2003.install.dir}devenv.exe" failonerror="false" />
<property name="msbuild.exe" value="C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild.exe"/>
<property name="buildconfiguration" value="Debug" />

<target name="RebuildAllSolutions" description="Rebuild all Solutions">
<call target="RebuildAllSolutions-1.1" />
<call target="RebuildAllSolutions-2.0" />
</target>

<target name="Clean">
<delete>
<fileset basedir="examples">
<include name="**/bin/**/*.*" />
<include name="**/obj/**/*.*" />
<exclude name="**/bin/*.refresh" />
</fileset>
</delete>
</target>

<target name="RebuildAllSolutions-1.1" depends="Clean">

<!-- build examples -->
<foreach item="File" property="filename">
<in>
<items basedir="examples">
<include name="**/*.2003.sln" />
<exclude name="**/SpringAir.2003.sln" /> <!-- unfort. doesn't work -->
</items>
</in>
<do>
<property name="solutionfile" value="${filename}" />
<property name="solutionconfiguration" value="${buildconfiguration}" />
<call target="RebuildSolution-1.1" />
</do>
</foreach>

<!-- build "main" solution (extra call because of configuration 'debug-1.1') -->
<property name="solutionfile" value="Spring.NET.2003.sln" />
<property name="solutionconfiguration" value="${buildconfiguration}-1.1" />
<call target="RebuildSolution-1.1" />

</target>

<target name="RebuildAllSolutions-2.0" dependes="Clean">
<foreach item="File" property="filename">
<in>
<items basedir="examples/Spring">
<include name="**/*.2005.sln" />
<include name="**/*.2008.sln" />
<include name="Spring.Data.NHibernate/Spring.Northwind.sln" />
</items>
</in>
<do>
<property name="solutionfile" value="${filename}" />
<property name="solutionconfiguration" value="${buildconfiguration}" />
<call target="RebuildSolution-2.0" />
</do>
</foreach>

<!-- build "main" solution -->
<property name="solutionfile" value="Spring.NET.2005.sln" />
<property name="solutionconfiguration" value="${buildconfiguration}" />
<call target="RebuildSolution-2.0" />

<!-- build "main" solution -->
<property name="solutionfile" value="Spring.NET.2008.sln" />
<property name="solutionconfiguration" value="${buildconfiguration}" />
<call target="RebuildSolution-2.0" />

</target>

<target name="RebuildSolution-1.1" description="rebuilds a given VS2003 solution file">
<!-- "c:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\devenv.exe" Spring.NET.2003.sln /rebuild Debug-1.1 /out solutions.build-1.1.log -->
<echo message="Rebuilding VS2003 Solution ${solutionfile}" />
<exec program="${devenv11.exe}" basedir="${devenv11.exe}">
<arg value="${solutionfile}" />
<arg line="/rebuild ${solutionconfiguration}" />
<arg line="/out solutions.build-1.1.log" />
</exec>
<property name="root.dir" value="${project::get-base-directory()}\.." overwrite="false" />

<property name="vs2003.install.dir.key" value="SOFTWARE\Microsoft\VisualStudio\7.1\InstallDir"/>
<readregistry property="vs2003.install.dir" key="${vs2003.install.dir.key}" hive="LocalMachine" failonerror="false"/>
<property name="devenv11.exe" value="${vs2003.install.dir}devenv.exe" if="${property::exists('vs2003.install.dir')}" />

<readregistry property="net35.install.dir" key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5\InstallPath" hive="LocalMachine" failonerror="true"/>
<property name="msbuild.exe" value="${net35.install.dir}\msbuild.exe"/>

<property name="buildconfiguration" value="Debug" />

<target name="RebuildAllSolutions" description="Rebuild all Solutions">
<call target="RebuildAllSolutions-1.1" if="${property::exists('vs2003.install.dir')}" />
<call target="RebuildAllSolutions-2.0" />
</target>

<target name="Clean">
<foreach item="Folder" property="dirname">
<in>
<items basedir="${root.dir}">
<include name="examples/**/obj" />
<include name="examples/**/PreCompiledWeb" />
<include name="build/VS.NET.*" />
</items>
</in>
<do>
<delete dir="${dirname}" />
</do>
</foreach>
<delete>
<fileset basedir="${root.dir}">
<include name="examples/**/bin/**/*.*" />
<exclude name="examples/**/bin/*.refresh" />
</fileset>
</delete>
</target>

<target name="RebuildAllSolutions-1.1" depends="Clean">

<!-- build examples -->
<foreach item="File" property="filename">
<in>
<items basedir="${root.dir}/examples">
<include name="**/*.2003.sln" />
<exclude name="**/SpringAir.2003.sln" /> <!-- unfort. doesn't work -->
</items>
</in>
<do>
<property name="solutionfile" value="${filename}" />
<property name="solutionconfiguration" value="${buildconfiguration}" />
<call target="RebuildSolution-1.1" />
</do>
</foreach>

<!-- build "main" solution (extra call because of configuration 'debug-1.1') -->
<property name="solutionfile" value="Spring.NET.2003.sln" />
<property name="solutionconfiguration" value="${buildconfiguration}-1.1" />
<call target="RebuildSolution-1.1" />

</target>

<target name="RebuildAllSolutions-2.0" depends="Clean">
<foreach item="File" property="filename">
<in>
<items basedir="${root.dir}">
<include name="examples/Spring/**/*.2005.sln" />
<include name="examples/Spring/**/*.2008.sln" />
<include name="examples/Spring/Spring.Data.NHibernate/Spring.Northwind.sln" />
<include name="*.2005.sln" />
<include name="*.2008.sln" />
</items>
</in>
<do>
<property name="solutionfile" value="${filename}" />
<property name="solutionconfiguration" value="${buildconfiguration}" />
<call target="RebuildSolution-2.0" />
</do>
</foreach>

<!-- build "main" solution -->
<!--
<solution configuration="${solutionconfiguration}" solutionfile="${solutionfile}">
<webmap>
<map url="http://localhost/Spring.Calculator.2003" path="examples\Spring\Spring.Calculator\src\Spring.Calculator.Web.2003" />
<map url="http://localhost/SpringAir.2003" path="examples\Spring\SpringAir\src\SpringAir.Web.2003" />
</webmap>
</solution>
<property name="solutionfile" value="${root.dir}/Spring.NET.2005.sln" />
<property name="solutionconfiguration" value="${buildconfiguration}" />
<call target="RebuildSolution-2.0" />
-->
</target>
<!-- build "main" solution -->
<!--
<property name="solutionfile" value="${root.dir}/Spring.NET.2008.sln" />
<property name="solutionconfiguration" value="${buildconfiguration}" />
<call target="RebuildSolution-2.0" />
-->
</target>

<target name="RebuildSolution-1.1" description="rebuilds a given VS2003 solution file">
<!-- "c:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\devenv.exe" Spring.NET.2003.sln /rebuild Debug-1.1 /out solutions.build-1.1.log -->
<echo message="Rebuilding VS2003 Solution ${solutionfile}" />
<exec program="${devenv11.exe}" basedir="${devenv11.exe}">
<arg value="${solutionfile}" />
<arg line="/rebuild ${solutionconfiguration}" />
<arg line="/out solutions.build-1.1.log" />
</exec>
<!--
<solution configuration="${solutionconfiguration}" solutionfile="${solutionfile}">
<webmap>
<map url="http://localhost/Spring.Calculator.2003" path="examples\Spring\Spring.Calculator\src\Spring.Calculator.Web.2003" />
<map url="http://localhost/SpringAir.2003" path="examples\Spring\SpringAir\src\SpringAir.Web.2003" />
</webmap>
</solution>
-->
</target>

<target name="RebuildSolution-2.0" description="rebuilds a given VS2005 solution file">
<echo message="Rebuilding VS2005 Solution ${solutionfile}" />
<exec program="${msbuild.exe}">
<target name="RebuildSolution-2.0" description="rebuilds a given VS2005 solution file">
<echo message="Rebuilding VS2005 Solution ${solutionfile}" />
<exec program="${msbuild.exe}">
<!--
<arg value="/property:OutDir=${output.dir}/"/>
<arg value="/property:OutDir=${output.dir}/"/>
-->
<arg value="${solutionfile}"/>
<arg line="/nologo" />
<arg line="/property:Configuration=${solutionconfiguration}"/>
</exec>
</target>
<arg value="${solutionfile}"/>
<arg line="/nologo" />
<arg line="/property:Configuration=${solutionconfiguration}"/>
</exec>
</target>

</project>
Binary file removed examples/Spring/Spring.Data.NHibernate.Northwind/lib/net/2.0/log4net.dll
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions ...Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2008.csproj
View file
Expand Up @@ -33,31 +33,31 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
<Reference Include="Common.Logging">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<Reference Include="Iesi.Collections">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<Reference Include="log4net">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\log4net.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=1.2.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<Reference Include="NHibernate">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\NHibernate.dll</HintPath>
</Reference>
<Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Spring.Core">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
</Reference>
<Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Spring.Data">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
</Reference>
<Reference Include="Spring.Data.NHibernate21, Version=1.1.1.20093, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Spring.Data.NHibernate21">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -96,7 +96,7 @@
<EmbeddedResource Include="Dao\Dao.xml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
Expand Down
Binary file removed ...g/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Antlr3.Runtime.dll
View file
Binary file not shown.
Binary file removed ...ring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/LinFu.DynamicProxy.dll
View file
Binary file not shown.
Binary file removed ...ta.NHibernate.Northwind/src/Spring.Northwind.Web.References/NHibernate.ByteCode.LinFu.dll
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions ....Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Properties/AssemblyInfo.cs
View file
Expand Up @@ -30,3 +30,9 @@
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

class LinkThem
{
private Spring.Data.NHibernate.HibernateTemplate ht = null;
private Spring.Web.UI.Page page = null;
}
31 changes: 18 additions & 13 deletions ...Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.2008.csproj
View file
Expand Up @@ -19,62 +19,67 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>.</OutputPath>
<OutputPath>./bin</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>.</OutputPath>
<OutputPath>./bin</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr3.Runtime, Version=3.1.0.39271, Culture=neutral, PublicKeyToken=3a9cab8f8d22bfb7, processorArchitecture=MSIL">
<Reference Include="Antlr3.Runtime, Culture=neutral, PublicKeyToken=3a9cab8f8d22bfb7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
<Reference Include="Common.Logging, Culture=neutral, PublicKeyToken=af08829b84f0328e">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<Reference Include="Common.Logging.Log4Net, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\2.0\Common.Logging.Log4Net.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<Reference Include="Iesi.Collections, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<Reference Include="log4net, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
<HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\log4net.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=2.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<Reference Include="NHibernate, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\NHibernate.dll</HintPath>
</Reference>
<Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Spring.Core, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
</Reference>
<Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Spring.Data, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
</Reference>
<Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Spring.Data.NHibernate21, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
</Reference>
<Reference Include="Spring.Web, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
<Reference Include="System.Data.SQLite, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\2.0\System.Data.SQLite.DLL</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
Expand Down
5 changes: 5 additions & 0 deletions ...nate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.csproj
View file
Expand Up @@ -60,12 +60,17 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
</Reference>
<Reference Include="Spring.Data.NHibernate21, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
</Reference>
<Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Web" />
<Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\2.0\System.Data.SQLite.DLL</HintPath>
Expand Down

0 comments on commit 8fd3506

Please sign in to comment.