Redesigning build sequence.

rsdn · Aug 15, 2014 · edb0265 · edb0265
1 parent e210afc
commit edb0265
Show file tree

Hide file tree

Showing 418 changed files with 20 additions and 82,089 deletions.
diff --git a/Build-4.5.1.cmd b/Build-4.5.1.cmd
diff --git a/Build-4.5.cmd b/Build-4.5.cmd
diff --git a/BuildInstallerFast-4.5.1.cmd b/BuildInstallerFast-4.5.1.cmd
diff --git a/BuildInstallerFast-4.5.cmd b/BuildInstallerFast-4.5.cmd
diff --git a/BuildInstallerFull-4.5.1.cmd b/BuildInstallerFull-4.5.1.cmd
diff --git a/BuildInstallerFull-4.5.cmd b/BuildInstallerFull-4.5.cmd
diff --git a/DevBuild2StageWithTests-4.5.1.cmd b/DevBuild2StageWithTests-4.5.1.cmd
diff --git a/DevBuild2StageWithTests-4.5.cmd b/DevBuild2StageWithTests-4.5.cmd
diff --git a/DevBuildQuick-4.5.1.cmd b/DevBuildQuick-4.5.1.cmd
diff --git a/DevBuildQuick-4.cmd → DevBuildQuick-VS2010.cmd b/DevBuildQuick-4.cmd → DevBuildQuick-VS2010.cmd
@@ -3,5 +3,5 @@ set NoPause=true
 %MSBuild% NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build  /tv:4.0 /p:TargetFrameworkVersion=v4.0
 
 rem /verbosity:n /p:TargetName=Build
-IF %errorlevel% == 0 call Reg-bins-2-4.0.cmd
+IF %errorlevel% == 0 call Reg-bins-VS2010.cmd
 pause
diff --git a/DevBuildQuick-4.5.cmd → DevBuildQuick-VS2012.cmd b/DevBuildQuick-4.5.cmd → DevBuildQuick-VS2012.cmd
@@ -1,7 +1,7 @@
 set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 set NoPause=true
-%MSBuild% NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build  /tv:4.0 /p:TargetFrameworkVersion=v4.5
+%MSBuild% NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build  /tv:4.0 /p:TargetFrameworkVersion=v4.0
 
 rem /verbosity:n /p:TargetName=Build
-IF %errorlevel% == 0 call Reg-bins-2-4.5.cmd
+IF %errorlevel% == 0 call Reg-bins-VS2012.cmd
 pause
diff --git a/DevBuildQuick-VS2013.cmd b/DevBuildQuick-VS2013.cmd
@@ -0,0 +1,7 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+set NoPause=true
+%MSBuild% NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build  /tv:4.0 /p:TargetFrameworkVersion=v4.0
+
+rem /verbosity:n /p:TargetName=Build
+IF %errorlevel% == 0 call Reg-bins-VS2013.cmd
+pause
diff --git a/DevBuildQuick-ncc-4.5.1.cmd b/DevBuildQuick-ncc-4.5.1.cmd
diff --git a/DevBuildQuick-ncc-4.cmd → DevBuildQuick-ncc-VS2010.cmd b/DevBuildQuick-ncc-4.cmd → DevBuildQuick-ncc-VS2010.cmd
@@ -2,5 +2,5 @@ set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 set NoPause=true
 %MSBuild% NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
 rem /verbosity:n /p:TargetName=Build
-IF %errorlevel% == 0 call Reg-bins-2-4.0.cmd
+IF %errorlevel% == 0 call Reg-bins-VS2010.cmd
 pause
diff --git a/DevBuildQuick-ncc-4.5.cmd → DevBuildQuick-ncc-VS2012.cmd b/DevBuildQuick-ncc-4.5.cmd → DevBuildQuick-ncc-VS2012.cmd
@@ -1,6 +1,6 @@
 set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 set NoPause=true
-%MSBuild% NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.5
+%MSBuild% NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
 rem /verbosity:n /p:TargetName=Build
-IF %errorlevel% == 0 call Reg-bins-2-4.5.cmd
+IF %errorlevel% == 0 call Reg-bins-VS2012.cmd
 pause
diff --git a/DevBuildQuick-ncc-VS2013.cmd b/DevBuildQuick-ncc-VS2013.cmd
@@ -0,0 +1,6 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+set NoPause=true
+%MSBuild% NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
+rem /verbosity:n /p:TargetName=Build
+IF %errorlevel% == 0 call Reg-bins-VS2013.cmd
+pause
diff --git a/DevBuildQuickWithTests-4.5.1.cmd b/DevBuildQuickWithTests-4.5.1.cmd
diff --git a/DevBuildQuickWithTests-4.5.cmd b/DevBuildQuickWithTests-4.5.cmd
diff --git a/NemerleAll.nproj b/NemerleAll.nproj
@@ -160,23 +160,11 @@
     <NIntegrationProject Condition=" '$(Configuration)' != 'Debug' " Include="$(NRoot)\tools\Nemerle.Evaluation.nproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(UseMSBuild)' != '' And '$(TargetFrameworkVersion)' == 'v4.0'">
+  <ItemGroup Condition="'$(UseMSBuild)' != '' And ('$(TargetFrameworkVersion)' == 'v4.0' Or '$(TargetFrameworkVersion)' == 'v4.5' Or '$(TargetFrameworkVersion)' == 'v4.5.1')">
     <NIntegrationProject Include="$(NRoot)\snippets\VS2010\WpfHint\WpfHint.csproj" />
     <NIntegrationProject Include="$(NRoot)\snippets\VS2010\Nemerle.Compiler.Utils\Nemerle.Compiler.Utils.csproj" />
     <NIntegrationProject Include="$(NRoot)\snippets\VS2010\Nemerle.VisualStudio\Nemerle.VisualStudio.csproj" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(UseMSBuild)' != '' And '$(TargetFrameworkVersion)' == 'v4.5'">
-    <NIntegrationProject Include="$(NRoot)\snippets\VS2010\WpfHint\WpfHint.csproj" />
-    <NIntegrationProject Include="$(NRoot)\snippets\VS2010\Nemerle.Compiler.Utils\Nemerle.Compiler.Utils-VS-2012.csproj" />
-    <NIntegrationProject Include="$(NRoot)\snippets\VS2010\Nemerle.VisualStudio\Nemerle.VisualStudio-VS-2012.csproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(UseMSBuild)' != '' And '$(TargetFrameworkVersion)' == 'v4.5.1'">
-    <NIntegrationProject Include="$(NRoot)\snippets\VS2010\WpfHint\WpfHint.csproj" />
-    <NIntegrationProject Include="$(NRoot)\snippets\VS2010\Nemerle.Compiler.Utils\Nemerle.Compiler.Utils-VS-2013.csproj" />
-    <NIntegrationProject Include="$(NRoot)\snippets\VS2010\Nemerle.VisualStudio\Nemerle.VisualStudio-VS-2013.csproj" />
-  </ItemGroup>
 
   <!--Initialize FX and SDK tools locations-->
   <Target Name="InitTools">

diff --git a/Reg-bins-2-4.0.cmd → Reg-bins-VS2010.cmd b/Reg-bins-2-4.0.cmd → Reg-bins-VS2010.cmd
diff --git a/Reg-bins-2-4.5.1.cmd → Reg-bins-VS2012.cmd b/Reg-bins-2-4.5.1.cmd → Reg-bins-VS2012.cmd
diff --git a/Reg-bins-2-4.5.cmd → Reg-bins-VS2013.cmd b/Reg-bins-2-4.5.cmd → Reg-bins-VS2013.cmd