From 0f838d13d2718d40c0ac9d8c1ca8a6ad718e28cb Mon Sep 17 00:00:00 2001 From: csharptest Date: Fri, 16 Sep 2011 16:16:09 -0500 Subject: Fixed line-endings in bat/txt files --- build/Build.bat | 18 ++++----- build/BuildAll.bat | 82 +++++++++++++++++++-------------------- build/BuildSilverlight2.bat | 8 ++-- build/GenerateCompletePackage.bat | 36 ++++++++--------- build/GenerateReleasePackage.bat | 24 ++++++------ build/RunBenchmarks.bat | 8 ++-- build/build35.bat | 16 ++++---- 7 files changed, 96 insertions(+), 96 deletions(-) (limited to 'build') diff --git a/build/Build.bat b/build/Build.bat index 3269d54b..2b246cad 100644 --- a/build/Build.bat +++ b/build/Build.bat @@ -1,10 +1,10 @@ -@echo off -SET BUILD_TARGET=%1 -SET BUILD_CONFIG=%2 - -IF "%BUILD_TARGET%"=="" SET BUILD_TARGET=Rebuild -IF "%BUILD_CONFIG%"=="" SET BUILD_CONFIG=Debug - -CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj %3 %4 %5 %6 /t:%BUILD_TARGET% /p:BuildConfiguration=%BUILD_CONFIG% /p:Platform="Any CPU" /p:BuildTools=4.0 /toolsversion:4.0" - +@echo off +SET BUILD_TARGET=%1 +SET BUILD_CONFIG=%2 + +IF "%BUILD_TARGET%"=="" SET BUILD_TARGET=Rebuild +IF "%BUILD_CONFIG%"=="" SET BUILD_CONFIG=Debug + +CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj %3 %4 %5 %6 /t:%BUILD_TARGET% /p:BuildConfiguration=%BUILD_CONFIG% /p:Platform="Any CPU" /p:BuildTools=4.0 /toolsversion:4.0" + pause \ No newline at end of file diff --git a/build/BuildAll.bat b/build/BuildAll.bat index 984fb791..e80ac8d9 100644 --- a/build/BuildAll.bat +++ b/build/BuildAll.bat @@ -1,42 +1,42 @@ -@ECHO OFF - -SET PREV_WORKING_DIR=%CD% -CD %~dp0 - -REM -- 3.5 Debug build, ensure this continues to work -%WINDIR%\Microsoft.NET\Framework\v3.5\MSBuild.exe build.csproj /t:Rebuild /p:BuildConfiguration=Debug /p:Platform="Any CPU" /p:BuildTools=3.5 /toolsversion:3.5" -IF ERRORLEVEL 1 GOTO ERROR - -REM -- 4.0 Debug build -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild /p:BuildConfiguration=Debug /p:Platform="Any CPU" -IF ERRORLEVEL 1 GOTO ERROR - -REM -- 4.0 Release build -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild /p:BuildConfiguration=Release /p:Platform="Any CPU" -IF ERRORLEVEL 1 GOTO ERROR - -IF EXIST "%ProgramFiles%\MSBuild\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" GOTO SILVERLIGHT -IF EXIST "%ProgramFiles(x86)%\MSBuild\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" GOTO SILVERLIGHT - -ECHO Unable to locate %ProgramFiles(x86)%\MSBuild\Microsoft\Silverlight\v2.0 -GOTO ERROR - -:SILVERLIGHT - -REM -- 4.0 Debug_Silverlight2 build -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild /p:BuildConfiguration=Debug_Silverlight2 /p:Platform="Any CPU" -IF ERRORLEVEL 1 GOTO ERROR - -REM -- 4.0 Release_Silverlight2 build -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild /p:BuildConfiguration=Release_Silverlight2 /p:Platform="Any CPU" -IF ERRORLEVEL 1 GOTO ERROR - -GOTO END - -:ERROR -CD %PREV_WORKING_DIR% -PAUSE - -:END -CD %PREV_WORKING_DIR% +@ECHO OFF + +SET PREV_WORKING_DIR=%CD% +CD %~dp0 + +REM -- 3.5 Debug build, ensure this continues to work +%WINDIR%\Microsoft.NET\Framework\v3.5\MSBuild.exe build.csproj /t:Rebuild /p:BuildConfiguration=Debug /p:Platform="Any CPU" /p:BuildTools=3.5 /toolsversion:3.5" +IF ERRORLEVEL 1 GOTO ERROR + +REM -- 4.0 Debug build +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild /p:BuildConfiguration=Debug /p:Platform="Any CPU" +IF ERRORLEVEL 1 GOTO ERROR + +REM -- 4.0 Release build +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild /p:BuildConfiguration=Release /p:Platform="Any CPU" +IF ERRORLEVEL 1 GOTO ERROR + +IF EXIST "%ProgramFiles%\MSBuild\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" GOTO SILVERLIGHT +IF EXIST "%ProgramFiles(x86)%\MSBuild\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" GOTO SILVERLIGHT + +ECHO Unable to locate %ProgramFiles(x86)%\MSBuild\Microsoft\Silverlight\v2.0 +GOTO ERROR + +:SILVERLIGHT + +REM -- 4.0 Debug_Silverlight2 build +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild /p:BuildConfiguration=Debug_Silverlight2 /p:Platform="Any CPU" +IF ERRORLEVEL 1 GOTO ERROR + +REM -- 4.0 Release_Silverlight2 build +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild /p:BuildConfiguration=Release_Silverlight2 /p:Platform="Any CPU" +IF ERRORLEVEL 1 GOTO ERROR + +GOTO END + +:ERROR +CD %PREV_WORKING_DIR% +PAUSE + +:END +CD %PREV_WORKING_DIR% SET PREV_WORKING_DIR= \ No newline at end of file diff --git a/build/BuildSilverlight2.bat b/build/BuildSilverlight2.bat index bc1dd21e..1baccacf 100644 --- a/build/BuildSilverlight2.bat +++ b/build/BuildSilverlight2.bat @@ -1,5 +1,5 @@ -@echo off - -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build /p:BuildConfiguration=Debug_Silverlight2 /p:Platform="Any CPU" - +@echo off + +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build /p:BuildConfiguration=Debug_Silverlight2 /p:Platform="Any CPU" + pause \ No newline at end of file diff --git a/build/GenerateCompletePackage.bat b/build/GenerateCompletePackage.bat index 6aa3b379..e2815961 100644 --- a/build/GenerateCompletePackage.bat +++ b/build/GenerateCompletePackage.bat @@ -1,19 +1,19 @@ -@ECHO OFF -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:PrepareOutputDirectory -IF ERRORLEVEL 1 GOTO END - -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Debug /p:Platform="Any CPU" %PROTOBUF_KEY_FILE% -IF ERRORLEVEL 1 GOTO END - -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Debug_Silverlight2 /p:Platform="Any CPU" %PROTOBUF_KEY_FILE% -IF ERRORLEVEL 1 GOTO END - -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Release /p:Platform="Any CPU" %PROTOBUF_KEY_FILE% -IF ERRORLEVEL 1 GOTO END - -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Release_Silverlight2 /p:Platform="Any CPU" %PROTOBUF_KEY_FILE% -IF ERRORLEVEL 1 GOTO END - -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:GeneratePackage /p:PackageName=AllBinariesAndSource.zip /p:Platform="Any CPU" - +@ECHO OFF +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:PrepareOutputDirectory +IF ERRORLEVEL 1 GOTO END + +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Debug /p:Platform="Any CPU" %PROTOBUF_KEY_FILE% +IF ERRORLEVEL 1 GOTO END + +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Debug_Silverlight2 /p:Platform="Any CPU" %PROTOBUF_KEY_FILE% +IF ERRORLEVEL 1 GOTO END + +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Release /p:Platform="Any CPU" %PROTOBUF_KEY_FILE% +IF ERRORLEVEL 1 GOTO END + +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Release_Silverlight2 /p:Platform="Any CPU" %PROTOBUF_KEY_FILE% +IF ERRORLEVEL 1 GOTO END + +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:GeneratePackage /p:PackageName=AllBinariesAndSource.zip /p:Platform="Any CPU" + :END \ No newline at end of file diff --git a/build/GenerateReleasePackage.bat b/build/GenerateReleasePackage.bat index 921de957..bd2a7f86 100644 --- a/build/GenerateReleasePackage.bat +++ b/build/GenerateReleasePackage.bat @@ -1,13 +1,13 @@ -@ECHO OFF -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:PrepareOutputDirectory -IF ERRORLEVEL 1 GOTO END - -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Release /p:Platform="Any CPU" %PROTOBUF_KEY_FILE% -IF ERRORLEVEL 1 GOTO END - -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Release_Silverlight2 /p:Platform="Any CPU" %PROTOBUF_KEY_FILE% -IF ERRORLEVEL 1 GOTO END - -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:GeneratePackage /p:PackageName=ReleaseBinaries.zip /p:Platform="Any CPU" - +@ECHO OFF +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:PrepareOutputDirectory +IF ERRORLEVEL 1 GOTO END + +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Release /p:Platform="Any CPU" %PROTOBUF_KEY_FILE% +IF ERRORLEVEL 1 GOTO END + +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Release_Silverlight2 /p:Platform="Any CPU" %PROTOBUF_KEY_FILE% +IF ERRORLEVEL 1 GOTO END + +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:GeneratePackage /p:PackageName=ReleaseBinaries.zip /p:Platform="Any CPU" + :END \ No newline at end of file diff --git a/build/RunBenchmarks.bat b/build/RunBenchmarks.bat index 863eafae..5a32f3f2 100644 --- a/build/RunBenchmarks.bat +++ b/build/RunBenchmarks.bat @@ -1,5 +1,5 @@ -@echo off - -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild %~dp0\build.csproj /m /t:RunBenchmarks /p:BuildConfiguration=Release /p:Platform="Any CPU" - +@echo off + +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild %~dp0\build.csproj /m /t:RunBenchmarks /p:BuildConfiguration=Release /p:Platform="Any CPU" + pause \ No newline at end of file diff --git a/build/build35.bat b/build/build35.bat index 87729d8f..02f803bd 100644 --- a/build/build35.bat +++ b/build/build35.bat @@ -1,8 +1,8 @@ -@echo off -SET BUILD_TARGET=%1 -SET BUILD_CONFIG=%2 - -IF "%BUILD_TARGET%"=="" SET BUILD_TARGET=Rebuild -IF "%BUILD_CONFIG%"=="" SET BUILD_CONFIG=Debug - -CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v3.5\MSBuild.exe build.csproj %3 %4 %5 %6 /t:%BUILD_TARGET% /p:BuildConfiguration=%BUILD_CONFIG% /p:Platform="Any CPU" /p:BuildTools=3.5 /toolsversion:3.5" +@echo off +SET BUILD_TARGET=%1 +SET BUILD_CONFIG=%2 + +IF "%BUILD_TARGET%"=="" SET BUILD_TARGET=Rebuild +IF "%BUILD_CONFIG%"=="" SET BUILD_CONFIG=Debug + +CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v3.5\MSBuild.exe build.csproj %3 %4 %5 %6 /t:%BUILD_TARGET% /p:BuildConfiguration=%BUILD_CONFIG% /p:Platform="Any CPU" /p:BuildTools=3.5 /toolsversion:3.5" -- cgit v1.2.3