added automatic vs.2008 detection

This commit is contained in:
eeichinger
2009-08-04 20:24:02 +00:00
parent 21f3cdd67a
commit 070c33503e
4 changed files with 12 additions and 6 deletions

View File

@@ -80,8 +80,6 @@ Commandline Examples:
<property name="test.full" value="false" />
<property name="test.integration.data" value="${test.full}" />
<!-- default location of mstest executable and reference assemblies -->
<readregistry property="vs-net.mstest.bin.dir" key="SOFTWARE\Microsoft\VisualStudio\9.0\InstallDir" hive="LocalMachine" failonerror="false"/>
<!--
the line below is for the ccnet build box - see target set-user-overrides for how to change this to your machine values if necessary
- or better check the registry key as shown above
@@ -1441,7 +1439,7 @@ Commandline Examples:
<property name="build-services" value="true" />
<property name="build-testing-nunit" value="true" />
<property name="build-testing-microsoft" value="false" />
<property name="build-testing-microsoft" value="${property::exists('vs-net.mstest.bin.dir')}" />
<property name="build-testing-microsoft" value="${property::exists('mstest.exe')}" />
<property name="build-web" value="true" />
<property name="build-nms" value="true" />
<property name="build-ems" value="${file::exists('lib/net/2.0/tibco.ems.dll')}" />
@@ -1477,7 +1475,7 @@ Commandline Examples:
<property name="build-data" value="true"/>
<property name="build-services" value="true"/>
<property name="build-testing-nunit" value="true"/>
<property name="build-testing-microsoft" value="${property::exists('vs-net.mstest.bin.dir')}" />
<property name="build-testing-microsoft" value="${property::exists('mstest.exe')}" />
<property name="build-web" value="true"/>
<property name="build-examples" value="true"/>
<property name="build-nms" value="true" />

View File

@@ -50,6 +50,12 @@
<property name="net-3.5.installed" value="${registry.net-3.5.installed == '1'}" />
<readregistry property="vs-net90.dir" key="SOFTWARE\Microsoft\VisualStudio\9.0\InstallDir" hive="LocalMachine" failonerror="false"/>
<!-- default location of mstest executable and reference assemblies -->
<property name="mstest.exe" value="${vs-net90.dir}/mstest.exe" if="${property::exists('vs-net90-dir')}" />
<target name="check-bin-dir">
<if test="${not property::exists('bin.dir')}">
<property name="bin.dir" value="${project::get-base-directory()}/build"/>

View File

@@ -28,11 +28,13 @@ Rebuilding Solutions using Nant and "solutions.build":
<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"/>
<readregistry property="vs2008.install.dir" key="SOFTWARE\Microsoft\VisualStudio\9.0\InstallDir" hive="LocalMachine" failonerror="false"/>
<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" />
<call target="RebuildAllSolutions-2.0" if="${property::exists('vs2008.install.dir')}" />
</target>
<target name="Clean">

View File

@@ -209,7 +209,7 @@ ${tool.dir} : dir for tools
<echo message="Unit Testing ${project.name} in ${test.bin.dir}" />
<exec program="${vs-net.mstest.bin.dir}\MSTest.exe" workingdir="${test.bin.dir}" verbose="false">
<exec program="${mstest.exe}" workingdir="${test.bin.dir}" verbose="false">
<arg value="/testcontainer:${test.bin.dir}/${test.assemblyname}.dll"/>
<arg value="/resultsfile:${test.assemblyname}.dll-MsTestResults.trx"/>
<arg value="/nologo" />