Skip to content

Commit 2b9a7f0

Browse files
NN---NN---
committed
Revert "Improve build scripts for those who don't have Framework 32-bit."
This reverts commit 7b8478d.
1 parent 7b8478d commit 2b9a7f0

29 files changed

+77
-73
lines changed

‎Build-3.5.cmd

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
@echo off
2-
call MSBuild-3.5.cmd NemerleAll.nproj /tv:3.5 /p:TargetFrameworkVersion=v3.5 /t:%*
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
2+
3+
%MSBuild% NemerleAll.nproj /tv:3.5 /p:TargetFrameworkVersion=v3.5 /t:%*

‎Build-4.0.cmd

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
@echo off
2-
call MSBuild-4.0.cmd NemerleAll.nproj /tv:4.0 /p:TargetFrameworkVersion=v4.0 /t:%*
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
2+
3+
%MSBuild% NemerleAll.nproj /tv:4.0 /p:TargetFrameworkVersion=v4.0 /t:%*

‎Build-4.5.cmd

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
@echo off
2-
call MSBuild-4.0.cmd NemerleAll.nproj /tv:4.0 /p:TargetFrameworkVersion=v4.5 /t:%*
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
2+
3+
%MSBuild% NemerleAll.nproj /tv:4.0 /p:TargetFrameworkVersion=v4.5 /t:%*

‎BuildInstallerFast-4.5.cmd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
call MSBuild-4.0.cmd NemerleAll.nproj /t:InstallerFast /tv:4.0 /p:TargetFrameworkVersion=v4.5;Configuration=Release
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
2+
3+
%MSBuild% NemerleAll.nproj /t:InstallerFast /tv:4.0 /p:TargetFrameworkVersion=v4.5;Configuration=Release

‎BuildInstallerFast-4.cmd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
call MSBuild-4.0.cmd NemerleAll.nproj /t:InstallerFast /tv:4.0 /p:TargetFrameworkVersion=v4.0;Configuration=Release
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
2+
3+
%MSBuild% NemerleAll.nproj /t:InstallerFast /tv:4.0 /p:TargetFrameworkVersion=v4.0;Configuration=Release

‎BuildInstallerFast.cmd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
call MSBuild-3.5.cmd NemerleAll.nproj /t:InstallerFast /p:Configuration=Release
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
2+
3+
%MSBuild% NemerleAll.nproj /t:InstallerFast /p:Configuration=Release

‎BuildInstallerFull-4.5.cmd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
call MSBuild-4.0.cmd NemerleAll.nproj /t:InstallerFull /tv:4.0 /p:TargetFrameworkVersion=v4.5;Configuration=Release
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
2+
3+
%MSBuild% NemerleAll.nproj /t:InstallerFull /tv:4.0 /p:TargetFrameworkVersion=v4.5;Configuration=Release
24

35
pause

‎BuildInstallerFull-4.cmd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
call MSBuild-4.0.cmd NemerleAll.nproj /t:InstallerFull /tv:4.0 /p:TargetFrameworkVersion=v4.0;Configuration=Release
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
2+
3+
%MSBuild% NemerleAll.nproj /t:InstallerFull /tv:4.0 /p:TargetFrameworkVersion=v4.0;Configuration=Release
24

35
pause

‎BuildInstallerFull.cmd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
call MSBuild-3.5.cmd NemerleAll.nproj /t:InstallerFull /p:Configuration=Release
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
2+
3+
%MSBuild% NemerleAll.nproj /t:InstallerFull /p:Configuration=Release
24

35
pause

‎BuildQuick-ncc-4.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
12
set NoPause=true
2-
call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Release /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
3+
%MSBuild% NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Release /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
34
rem /verbosity:n /p:TargetName=Build
45
pause

‎BuildTest-4.cmd

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
@echo off
22

3+
IF NOT "%PROCESSOR_ARCHITECTURE%" == "x86" goto b64
4+
IF NOT "%PROCESSOR_ARCHITEW6432%" == "" goto b64
5+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
6+
goto b32
7+
:b64
8+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe"
9+
:b32
10+
11+
@echo MSBuild=%MSBuild%
12+
313
set errors=no
414
goto skip
515
:err_check
@@ -10,7 +20,7 @@ exit /b %1
1020

1121
IF "%Type%"=="" set Type=Debug
1222

13-
call MSBuild-4.0.cmd Tests.nproj /p:Configuration=%Type% /tv:4.0 /p:TargetFrameworkVersion=v4.0
23+
%MSBuild% Tests.nproj /p:Configuration=%Type% /tv:4.0 /p:TargetFrameworkVersion=v4.0
1424
call :err_check %errorlevel%
1525
IF %errors% == yes goto Error
1626

‎BuildTest.cmd

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
@echo off
22

3+
IF NOT "%PROCESSOR_ARCHITECTURE%" == "x86" goto b64
4+
IF NOT "%PROCESSOR_ARCHITEW6432%" == "" goto b64
5+
set MSBuild=%SystemRoot%\Microsoft.NET\Framework\v2.0.50727\MSBuild.exe
6+
goto b32
7+
:b64
8+
set MSBuild=%SystemRoot%\Microsoft.NET\Framework64\v2.0.50727\MSBuild.exe
9+
:b32
10+
11+
@echo MSBuild=%MSBuild%
12+
313
set errors=no
414
goto skip
515
:err_check
@@ -10,7 +20,7 @@ exit /b %1
1020

1121
IF "%Type%"=="" set Type=Debug
1222

13-
call MSBuild-2.0.cmd Tests.nproj /p:Configuration=%Type%
23+
%MSBuild% Tests.nproj /p:Configuration=%Type%
1424
call :err_check %errorlevel%
1525
IF %errors% == yes goto Error
1626

‎DevBuild2Stage.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
call MSBuild-3.5.cmd NemerleAll.nproj /target:DevBuild2Stage /p:Configuration=Debug /verbosity:n
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
2+
%MSBuild% NemerleAll.nproj /target:DevBuild2Stage /p:Configuration=Debug /verbosity:n
23
rem /p:NTargetName=Build
34
pause

‎DevBuild2StageWithTests-4.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
12
set NoPause=true
2-
call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuild2StageWithTests /p:Configuration=Debug /verbosity:n /tv:4.0 /p:TargetFrameworkVersion=v4.0
3+
%MSBuild% NemerleAll.nproj /target:DevBuild2StageWithTests /p:Configuration=Debug /verbosity:n /tv:4.0 /p:TargetFrameworkVersion=v4.0
34
rem /p:NTargetName=Build
45
IF %errorlevel% == 0 call Reg-bins-2-4.0.cmd
56
pause

‎DevBuild2StageWithTests.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
12
set NoPause=true
2-
call MSBuild-3.5.cmd NemerleAll.nproj /target:DevBuild2StageWithTests /p:Configuration=Debug /verbosity:n
3+
%MSBuild% NemerleAll.nproj /target:DevBuild2StageWithTests /p:Configuration=Debug /verbosity:n
34
rem /p:NTargetName=Build
45
IF %errorlevel% == 0 call Reg-bins-2.cmd
56
pause

‎DevBuildForCommit-4.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
12
set NoPause=true
2-
call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildFull /p:Configuration=Debug /verbosity:n /tv:4.0 /p:TargetFrameworkVersion=v4.0
3+
%MSBuild% NemerleAll.nproj /target:DevBuildFull /p:Configuration=Debug /verbosity:n /tv:4.0 /p:TargetFrameworkVersion=v4.0
34
rem /p:TargetName=ReBuild
45
pause

‎DevBuildForCommit.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
call MSBuild-3.5.cmd NemerleAll.nproj /target:DevBuildFull /p:Configuration=Debug /verbosity:n
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
2+
%MSBuild% NemerleAll.nproj /target:DevBuildFull /p:Configuration=Debug /verbosity:n
23
pause

‎DevBuildQuick-4.5.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
12
set NoPause=true
2-
call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.5
3+
%MSBuild% NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.5
34

45
rem /verbosity:n /p:TargetName=Build
56
IF %errorlevel% == 0 call Reg-bins-2-4.5.cmd

‎DevBuildQuick-4.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
12
set NoPause=true
2-
call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
3+
%MSBuild% NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
34

45
rem /verbosity:n /p:TargetName=Build
56
IF %errorlevel% == 0 call Reg-bins-2-4.0.cmd

‎DevBuildQuick-ncc-4.5.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
12
set NoPause=true
2-
call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.5
3+
%MSBuild% NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.5
34
rem /verbosity:n /p:TargetName=Build
45
IF %errorlevel% == 0 call Reg-bins-2-4.5.cmd
56
pause

‎DevBuildQuick-ncc-4.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
12
set NoPause=true
2-
call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
3+
%MSBuild% NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
34
rem /verbosity:n /p:TargetName=Build
45
IF %errorlevel% == 0 call Reg-bins-2-4.0.cmd
56
pause

‎DevBuildQuick-ncc.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
12
set NoPause=true
2-
call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
3+
%MSBuild% NemerleAll.nproj /target:DevBuildQuickNccOnly /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
34
rem /verbosity:n /p:TargetName=Build
45
IF %errorlevel% == 0 call Reg-bins-2.cmd
56
pause

‎DevBuildQuick.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
12
set NoPause=true
2-
call MSBuild-3.5.cmd NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
3+
%MSBuild% NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
34
rem /verbosity:n /p:TargetName=Build
45
IF %errorlevel% == 0 call Reg-bins-2.cmd
56
pause

‎DevBuildQuickWithTests-4.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
call MSBuild-4.0.cmd NemerleAll.nproj /target:DevBuildQuickWithTests /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
2+
%MSBuild% NemerleAll.nproj /target:DevBuildQuickWithTests /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
23
rem /verbosity:n /p:TargetName=Build
34
pause

‎DevBuildQuickWithTests.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
call MSBuild-3.5.cmd NemerleAll.nproj /target:DevBuildQuickWithTests /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
1+
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild.exe"
2+
%MSBuild% NemerleAll.nproj /target:DevBuildQuickWithTests /p:Configuration=Debug /verbosity:n /p:NTargetName=Build
23
rem /verbosity:n /p:TargetName=Build
34
pause

‎MSBuild-2.0.cmd

-2
This file was deleted.

‎MSBuild-3.5.cmd

-2
This file was deleted.

‎MSBuild-4.0.cmd

-2
This file was deleted.

‎MSBuild.cmd

-39
This file was deleted.

0 commit comments

Comments
 (0)