Revert "Improve build scripts for those who don't have Framework 32-bit."

NN--- · NN--- · commit 2b9a7f0963fd · 2013-08-06T14:05:55.000+03:00
This reverts commit 7b8478d.
diff --git a/Build-3.5.cmd b/Build-3.5.cmd
@@ -1,2 +1,3 @@
-@echo off
-call MSBuild-3.5.cmd NemerleAll.nproj /tv:3.5 /p:TargetFrameworkVersion=v3.5 /t:%*
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
+
+%MSBuild% NemerleAll.nproj /tv:3.5 /p:TargetFrameworkVersion=v3.5 /t:%*
diff --git a/Build-4.0.cmd b/Build-4.0.cmd
@@ -1,2 +1,3 @@
-@echo off
-call MSBuild-4.0.cmd NemerleAll.nproj /tv:4.0 /p:TargetFrameworkVersion=v4.0 /t:%*
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+
+%MSBuild% NemerleAll.nproj /tv:4.0 /p:TargetFrameworkVersion=v4.0 /t:%*
diff --git a/Build-4.5.cmd b/Build-4.5.cmd
@@ -1,2 +1,3 @@
-@echo off
-call MSBuild-4.0.cmd NemerleAll.nproj /tv:4.0 /p:TargetFrameworkVersion=v4.5 /t:%*
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+
+%MSBuild% NemerleAll.nproj /tv:4.0 /p:TargetFrameworkVersion=v4.5 /t:%*
diff --git a/BuildInstallerFast-4.5.cmd b/BuildInstallerFast-4.5.cmd
@@ -1 +1,3 @@
-call MSBuild-4.0.cmd NemerleAll.nproj /t:InstallerFast /tv:4.0 /p:TargetFrameworkVersion=v4.5;Configuration=Release
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+
+%MSBuild% NemerleAll.nproj /t:InstallerFast /tv:4.0 /p:TargetFrameworkVersion=v4.5;Configuration=Release
diff --git a/BuildInstallerFast-4.cmd b/BuildInstallerFast-4.cmd
@@ -1 +1,3 @@
-call MSBuild-4.0.cmd NemerleAll.nproj /t:InstallerFast /tv:4.0 /p:TargetFrameworkVersion=v4.0;Configuration=Release
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+
+%MSBuild% NemerleAll.nproj /t:InstallerFast /tv:4.0 /p:TargetFrameworkVersion=v4.0;Configuration=Release
diff --git a/BuildInstallerFast.cmd b/BuildInstallerFast.cmd
@@ -1 +1,3 @@
-call MSBuild-3.5.cmd NemerleAll.nproj /t:InstallerFast /p:Configuration=Release
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
+
+%MSBuild% NemerleAll.nproj /t:InstallerFast /p:Configuration=Release
diff --git a/BuildInstallerFull-4.5.cmd b/BuildInstallerFull-4.5.cmd
@@ -1,3 +1,5 @@
-call MSBuild-4.0.cmd NemerleAll.nproj /t:InstallerFull /tv:4.0 /p:TargetFrameworkVersion=v4.5;Configuration=Release
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+
+%MSBuild% NemerleAll.nproj /t:InstallerFull /tv:4.0 /p:TargetFrameworkVersion=v4.5;Configuration=Release
 
 pause
diff --git a/BuildInstallerFull-4.cmd b/BuildInstallerFull-4.cmd
@@ -1,3 +1,5 @@
-call MSBuild-4.0.cmd NemerleAll.nproj /t:InstallerFull /tv:4.0 /p:TargetFrameworkVersion=v4.0;Configuration=Release
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+
+%MSBuild% NemerleAll.nproj /t:InstallerFull /tv:4.0 /p:TargetFrameworkVersion=v4.0;Configuration=Release
 
 pause
diff --git a/BuildInstallerFull.cmd b/BuildInstallerFull.cmd
@@ -1,3 +1,5 @@
-call MSBuild-3.5.cmd NemerleAll.nproj /t:InstallerFull /p:Configuration=Release
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
+
+%MSBuild% NemerleAll.nproj /t:InstallerFull /p:Configuration=Release
 
 pause
diff --git a/BuildQuick-ncc-4.cmd b/BuildQuick-ncc-4.cmd
@@ -1,4 +1,5 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 set NoPause=true
-call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Release /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
+%MSBuild% NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Release /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
 rem /verbosity:n /p:TargetName=Build
 pause
diff --git a/BuildTest-4.cmd b/BuildTest-4.cmd
@@ -1,5 +1,15 @@
 @echo off
 
+IF NOT "%PROCESSOR_ARCHITECTURE%" == "x86" goto b64
+IF NOT "%PROCESSOR_ARCHITEW6432%" == "" goto b64
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+goto b32
+:b64
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe"
+:b32
+
+@echo MSBuild=%MSBuild%
+
 set errors=no
 goto skip
 :err_check
@@ -10,7 +20,7 @@ exit /b %1
 
 IF "%Type%"=="" set Type=Debug
 
-call MSBuild-4.0.cmd Tests.nproj /p:Configuration=%Type% /tv:4.0 /p:TargetFrameworkVersion=v4.0
+%MSBuild% Tests.nproj /p:Configuration=%Type% /tv:4.0 /p:TargetFrameworkVersion=v4.0
 call :err_check %errorlevel%
 IF %errors% == yes goto Error
 
diff --git a/BuildTest.cmd b/BuildTest.cmd
@@ -1,5 +1,15 @@
 @echo off
 
+IF NOT "%PROCESSOR_ARCHITECTURE%" == "x86" goto b64
+IF NOT "%PROCESSOR_ARCHITEW6432%" == "" goto b64
+set MSBuild=%SystemRoot%\Microsoft.NET\Framework\v2.0.50727\MSBuild.exe
+goto b32
+:b64
+set MSBuild=%SystemRoot%\Microsoft.NET\Framework64\v2.0.50727\MSBuild.exe
+:b32
+
+@echo MSBuild=%MSBuild%
+
 set errors=no
 goto skip
 :err_check
@@ -10,7 +20,7 @@ exit /b %1
 
 IF "%Type%"=="" set Type=Debug
 
-call MSBuild-2.0.cmd Tests.nproj /p:Configuration=%Type%
+%MSBuild% Tests.nproj /p:Configuration=%Type%
 call :err_check %errorlevel%
 IF %errors% == yes goto Error
 
diff --git a/DevBuild2Stage.cmd b/DevBuild2Stage.cmd
@@ -1,3 +1,4 @@
-call MSBuild-3.5.cmd NemerleAll.nproj /target:DevBuild2Stage /p:Configuration=Debug /verbosity:n 
+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
diff --git a/DevBuild2StageWithTests-4.cmd b/DevBuild2StageWithTests-4.cmd
@@ -1,5 +1,6 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 set NoPause=true
-call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuild2StageWithTests /p:Configuration=Debug /verbosity:n /tv:4.0 /p:TargetFrameworkVersion=v4.0
+%MSBuild% NemerleAll.nproj /target:DevBuild2StageWithTests /p:Configuration=Debug /verbosity:n /tv:4.0 /p:TargetFrameworkVersion=v4.0
 rem /p:NTargetName=Build
 IF %errorlevel% == 0 call Reg-bins-2-4.0.cmd
 pause
diff --git a/DevBuild2StageWithTests.cmd b/DevBuild2StageWithTests.cmd
@@ -1,5 +1,6 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
 set NoPause=true
-call MSBuild-3.5.cmd NemerleAll.nproj /target:DevBuild2StageWithTests /p:Configuration=Debug /verbosity:n
+%MSBuild% NemerleAll.nproj /target:DevBuild2StageWithTests /p:Configuration=Debug /verbosity:n
 rem /p:NTargetName=Build
 IF %errorlevel% == 0 call Reg-bins-2.cmd
 pause
diff --git a/DevBuildForCommit-4.cmd b/DevBuildForCommit-4.cmd
@@ -1,4 +1,5 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 set NoPause=true
-call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildFull /p:Configuration=Debug /verbosity:n  /tv:4.0 /p:TargetFrameworkVersion=v4.0
+%MSBuild% NemerleAll.nproj /target:DevBuildFull /p:Configuration=Debug /verbosity:n  /tv:4.0 /p:TargetFrameworkVersion=v4.0
 rem  /p:TargetName=ReBuild
 pause
diff --git a/DevBuildForCommit.cmd b/DevBuildForCommit.cmd
@@ -1,2 +1,3 @@
-call MSBuild-3.5.cmd NemerleAll.nproj /target:DevBuildFull /p:Configuration=Debug /verbosity:n
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
+%MSBuild% NemerleAll.nproj /target:DevBuildFull /p:Configuration=Debug /verbosity:n
 pause
diff --git a/DevBuildQuick-4.5.cmd b/DevBuildQuick-4.5.cmd
@@ -1,5 +1,6 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 set NoPause=true
-call MSBuild-4.0.cmd 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.5
 
 rem /verbosity:n /p:TargetName=Build
 IF %errorlevel% == 0 call Reg-bins-2-4.5.cmd
diff --git a/DevBuildQuick-4.cmd b/DevBuildQuick-4.cmd
@@ -1,5 +1,6 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 set NoPause=true
-call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build  /tv:4.0 /p:TargetFrameworkVersion=v4.0
+%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
diff --git a/DevBuildQuick-ncc-4.5.cmd b/DevBuildQuick-ncc-4.5.cmd
@@ -1,5 +1,6 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 set NoPause=true
-call MSBuild-4.0.cmd 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.5
 rem /verbosity:n /p:TargetName=Build
 IF %errorlevel% == 0 call Reg-bins-2-4.5.cmd
 pause
diff --git a/DevBuildQuick-ncc-4.cmd b/DevBuildQuick-ncc-4.cmd
@@ -1,5 +1,6 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 set NoPause=true
-call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
+%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
 pause
diff --git a/DevBuildQuick-ncc.cmd b/DevBuildQuick-ncc.cmd
@@ -1,5 +1,6 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
 set NoPause=true
-call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
+%MSBuild% NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
 rem /verbosity:n /p:TargetName=Build
 IF %errorlevel% == 0 call Reg-bins-2.cmd
 pause
diff --git a/DevBuildQuick.cmd b/DevBuildQuick.cmd
@@ -1,5 +1,6 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
 set NoPause=true
-call MSBuild-3.5.cmd NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
+%MSBuild% NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
 rem /verbosity:n /p:TargetName=Build
 IF %errorlevel% == 0 call Reg-bins-2.cmd
 pause
diff --git a/DevBuildQuickWithTests-4.cmd b/DevBuildQuickWithTests-4.cmd
@@ -1,3 +1,4 @@
-call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildQuickWithTests /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+%MSBuild% NemerleAll.nproj /target:DevBuildQuickWithTests /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
 rem /verbosity:n /p:TargetName=Build
 pause
diff --git a/DevBuildQuickWithTests.cmd b/DevBuildQuickWithTests.cmd
@@ -1,3 +1,4 @@
-call MSBuild-3.5.cmd NemerleAll.nproj /target:DevBuildQuickWithTests /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
+%MSBuild% NemerleAll.nproj /target:DevBuildQuickWithTests /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
 rem /verbosity:n /p:TargetName=Build
 pause
diff --git a/MSBuild-2.0.cmd b/MSBuild-2.0.cmd
diff --git a/MSBuild-3.5.cmd b/MSBuild-3.5.cmd
diff --git a/MSBuild-4.0.cmd b/MSBuild-4.0.cmd
diff --git a/MSBuild.cmd b/MSBuild.cmd
