Permalink
Browse files

1. Added DevBuild2Stage.cmd, DevBuildForCommit.cmd cmd's.

2. Targets: DevBuildQuick, DevBuild2Stage, DevBuild2StageWithTests and DevBuildFull has been unified.
3. NUnit assemblies has been added into ExternalDependences.

git-svn-id: https://nemerle.googlecode.com/svn/nemerle/trunk@8614 c8a6711f-211a-0410-a8d5-2f220496d6d1
  • Loading branch information...
1 parent b086867 commit 228607855e940ae3711be7402d90a38f0423cb9f @VladD2 VladD2 committed Mar 15, 2010
View
@@ -0,0 +1,4 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
+%MSBuild% NemerleAll.nproj /target:DevBuild2Stage /p:Configuration=Debug /verbosity:n
+rem /p:NTargetName=Build
+pause
@@ -0,0 +1,4 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
+%MSBuild% NemerleAll.nproj /target:DevBuild2StageWithTests /p:Configuration=Debug /verbosity:n
+rem /p:NTargetName=Build
+pause
View
@@ -1,3 +1,3 @@
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
-%MSBuild% NemerleAll.nproj /target:DevBuildFull /p:Configuration=Debug
+%MSBuild% NemerleAll.nproj /target:DevBuildFull /p:Configuration=Debug /verbosity:n
pause
View
@@ -1,4 +1,4 @@
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
-%MSBuild% NemerleAll.nproj /target:DevBuildFast /p:Configuration=Debug
+%MSBuild% NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
rem /verbosity:n /p:TargetName=Build
pause
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<configuration>
+ <!--
+ Application settings for NUnit-console.exe. Do NOT put settings
+ for use by your tests here.
+ -->
+ <appSettings>
+ <!--
+ Specify the location to be used by .NET for the cache
+ -->
+ <add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
+ </appSettings>
+
+ <!-- Set the level for tracing NUnit itself -->
+ <!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->
+ <system.diagnostics>
+ <switches>
+ <add name="NTrace" value="0" />
+ </switches>
+ </system.diagnostics>
+
+ <runtime>
+ <!-- We need this so test exceptions don't crash NUnit -->
+ <legacyUnhandledExceptionPolicy enabled="1" />
+
+ <!-- Look for addins in the addins directory for now -->
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <probing privatePath="lib;addins"/>
+ </assemblyBinding>
+
+ <!--
+ The following <assemblyBinding> section allows running nunit under
+ .NET 1.0 by redirecting assemblies. The appliesTo attribute
+ causes the section to be ignored except under .NET 1.0
+ on a machine with only the .NET version 1.0 runtime installed.
+ If application and its tests were built for .NET 1.1 you will
+ also need to redirect system assemblies in the test config file,
+ which controls loading of the tests.
+ -->
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
+ appliesTo="v1.0.3705">
+
+ <dependentAssembly>
+ <assemblyIdentity name="System"
+ publicKeyToken="b77a5c561934e089"
+ culture="neutral"/>
+ <bindingRedirect oldVersion="1.0.5000.0"
+ newVersion="1.0.3300.0"/>
+ </dependentAssembly>
+
+ <dependentAssembly>
+ <assemblyIdentity name="System.Data"
+ publicKeyToken="b77a5c561934e089"
+ culture="neutral"/>
+ <bindingRedirect oldVersion="1.0.5000.0"
+ newVersion="1.0.3300.0"/>
+ </dependentAssembly>
+
+ <dependentAssembly>
+ <assemblyIdentity name="System.Drawing"
+ publicKeyToken="b03f5f7f11d50a3a"
+ culture="neutral"/>
+ <bindingRedirect oldVersion="1.0.5000.0"
+ newVersion="1.0.3300.0"/>
+ </dependentAssembly>
+
+ <dependentAssembly>
+ <assemblyIdentity name="System.Windows.Forms"
+ publicKeyToken="b77a5c561934e089"
+ culture="neutral"/>
+ <bindingRedirect oldVersion="1.0.5000.0"
+ newVersion="1.0.3300.0"/>
+ </dependentAssembly>
+
+ <dependentAssembly>
+ <assemblyIdentity name="System.Xml"
+ publicKeyToken="b77a5c561934e089"
+ culture="neutral"/>
+ <bindingRedirect oldVersion="1.0.5000.0"
+ newVersion="1.0.3300.0"/>
+ </dependentAssembly>
+
+ </assemblyBinding>
+
+ </runtime>
+
+</configuration>
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -1,4 +1,4 @@
-<Project DefaultTargets="DevBuildStage2" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="DevBuild2Stage" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<UsingTask TaskName="MSBuild.Community.Tasks.FileUpdate" AssemblyFile="$(MSBuildProjectDirectory)\ExternalDependences\MSBuild.Community.Tasks.dll" />
<PropertyGroup Condition=" '$(NTargetName)' == '' ">
<NTargetName>Rebuild</NTargetName>
@@ -59,15 +59,15 @@
<MSBuild>$(MSBuildBinPath)\msbuild.exe</MSBuild>
<Junction>$(NRoot)\ExternalDependences\junction.exe</Junction>
</PropertyGroup>
- <Message Text="Framework tools found at:" Importance="high" />
- <Message Text=" MSBuild - $(MSBuild)" />
- <Message Text=" NGen - $(NGen)" />
- <Message Text="SDK tools found at:" Importance="high" />
- <Message Text=" GacUtil - $(GacUtil)" />
- <Message Text=" Ildasm - $(Ildasm)" />
- <Message Text=" PEVerify - $(PEVerify)" />
- <Message Text="ExternalDependences:" Importance="high" />
- <Message Text=" Junction - $(Junction)" />
+ <Message Text="Framework tools found at:" Importance="high" />
+ <Message Text=" MSBuild - $(MSBuild)" Importance="high" />
+ <Message Text=" NGen - $(NGen)" Importance="high" />
+ <Message Text="SDK tools found at:" Importance="high" />
+ <Message Text=" GacUtil - $(GacUtil)" Importance="high" />
+ <Message Text=" Ildasm - $(Ildasm)" Importance="high" />
+ <Message Text=" PEVerify - $(PEVerify)" Importance="high" />
+ <Message Text="ExternalDependences:" Importance="high" />
+ <Message Text=" Junction - $(Junction)" Importance="high" />
</Target>
<!--Builds compiler using boot-->
<Target Name="Stage1" DependsOnTargets="InitTools">
@@ -110,20 +110,19 @@
<MSBuild Projects="@(NCompilerProject)" Properties="OutputPath=$(NCurBin); IntermediateOutputPath=$(NCurObj); Nemerle=$(NPrevBin)" Targets="$(NTargetName)" />
<Copy SourceFiles="@(NTargets)" DestinationFolder="$(NCurBin)" />
</Target>
- <!--Builds all tools, linq, vs integration and shell. Only Stage1 compiler required.-->
- <Target Name="IntegrationFast" DependsOnTargets="Stage1; _Integration">
- </Target>
+
+ <!--Builds all tools, linq, vs integration and shell. Only Stage1 compiler required.-->
+ <Target Name="IntegrationFast" DependsOnTargets="Stage1; _Integration" />
<!--Builds all tools, linq, vs integration and shell. Stage4 compiler required.-->
- <Target Name="IntegrationFull" DependsOnTargets="Stage4; Validate; CompilerTests; _Integration">
- </Target>
+ <Target Name="IntegrationFull" DependsOnTargets="Stage4; Validate; CompilerTests; _Integration; IdeEngineTests" />
<!--Builds MSI package. Only Stage1 compiler required.-->
- <Target Name="InstallerFast" DependsOnTargets="IntegrationFast; _Installer">
- </Target>
- <!--Builds MSI package. Stage4 compiler required.-->
- <Target Name="InstallerFull" DependsOnTargets="IntegrationFull; _Installer">
- </Target>
+ <Target Name="InstallerFast" DependsOnTargets="IntegrationFast; _Installer" />
+
+ <!--Builds MSI package. Stage4 compiler required.-->
+ <Target Name="InstallerFull" DependsOnTargets="IntegrationFull; _Installer" />
+
<!--Compare last two stages on IL level-->
<Target Name="Validate" DependsOnTargets="InitTools">
<ItemGroup>
@@ -145,6 +144,7 @@
<Delete Files="@(IL_PREV)" />
<Delete Files="@(IL_LAST)" />
</Target>
+
<!--Runs compiler tests.-->
<Target Name="CompilerTests">
<!--Build tester-->
@@ -154,9 +154,9 @@
<!--Run negative tests-->
<Exec Command="tests.exe -d:negative -p &quot;-nowarn:10003 -def:RUNTIME_MS&quot; -s" WorkingDirectory="$(NRoot)\ncc\testsuite" />
</Target>
+
<!--Install Nemerle compiler to specified folder. By default to ProgramFiles. To override folder set NInstall property.-->
<Target Name="Install" DependsOnTargets="InitTools">
-
<Error Condition=" '$(NCurBin)' == '' " Text="Property NCurBin is not set. Any stage of compilation should preceed the Install target." />
<!--Path which should contane binary filese to be installed-->
<!--PropertyGroup Condition=" '$(NCurBin)' == '' ">
@@ -188,20 +188,25 @@
<Exec Command="reg.exe add HKCU\Software\Microsoft\VisualStudio\9.0Exp\Configuration\MSBuild\SafeImports /v NemerleTarget /d $(TargetLocation) /f" StdOutEncoding="Windows-1251" />
<Exec Command="$(Junction) &quot;$(ProgramW6432)\Nemerle&quot; &quot;$(ProgramFiles(x86))\Nemerle&quot;" Condition="'$(ProgramW6432)' != '' " IgnoreExitCode="true" />
</Target>
- <Target Name="DevBuildFast" DependsOnTargets="IntegrationFast;Install">
- <Message Importance="high" Text="DevBuildFast done!" />
- </Target>
- <Target Name="DevBuildFull" DependsOnTargets="IntegrationFull;Install">
- <Message Importance="high" Text="DevBuildFull done!" />
- </Target>
- <Target Name="DevBuildStage2" DependsOnTargets="Stage2; _Integration; Install"></Target>
- <!--Helper target to build integration-->
+
+ <Target Name="IdeEngineTests"> <!--DependsOnTargets="IntegrationFull"-->
+ <!--Run NUnit-tests for Nemerle.Compiler.Utils.dll (Engine Extentions of compiler engine)-->
+ <Exec Command="&quot;$(NRoot)\ExternalDependences\nunit-console.exe&quot; /nologo &quot;$(NRoot)\VsIntegration\Nemerle.Compiler.Utils.Tests\bin\$(Configuration)\Nemerle.Compiler.Utils.Tests.dll&quot;" />
+ </Target>
+
+ <!--Helper target to build integration-->
<Target Name="_Integration">
<MSBuild Projects="@(NIntegrationProject)" Targets="$(NTargetName)" Properties="Nemerle=$(NCurBin); Configuration=$(Configuration)" />
</Target>
+
+ <Target Name="DevBuildQuick" DependsOnTargets="Stage1; _Integration; Install" />
+ <Target Name="DevBuild2Stage" DependsOnTargets="Stage2; _Integration; Install" />
+ <Target Name="DevBuild2StageWithTests" DependsOnTargets="Stage2; CompilerTests; _Integration; IdeEngineTests; Install" />
+ <Target Name="DevBuildFull" DependsOnTargets="Stage4; Validate; CompilerTests; _Integration; IdeEngineTests; Install" />
+
<!--Helper target to build installer.-->
<Target Name="_Installer" Condition=" '$(Configuration)' != 'Debug' ">
- <RemoveDir Directories="$(NRoot)\misc\packages\wix\dist"></RemoveDir>
+ <RemoveDir Directories="$(NRoot)\misc\packages\wix\dist" />
<MSBuild Projects="$(NRoot)\misc\packages\wix\nemerle.sln" Targets="$(NTargetName)" Properties="Nemerle=$(NCurBin); Configuration=$(Configuration)" />
</Target>
</Project>

0 comments on commit 2286078

Please sign in to comment.