Skip to content
This repository has been archived by the owner on Jun 1, 2022. It is now read-only.

Commit

Permalink
fix compilation script errors for v2.48-2015.12.28
Browse files Browse the repository at this point in the history
  • Loading branch information
dzharii committed Dec 29, 2015
1 parent 1ae523f commit a6cf1d4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ build/SwdPageRecorder_Latest
[Bb]in/
[Oo]bj/

.vs

# mstest test results
TestResults

Expand Down
19 changes: 16 additions & 3 deletions build/go.bat
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,16 @@ echo Hello! >%STDOUT_DEFAULT%



@"C:\Program Files (x86)\MSBuild\12.0\Bin\MSBuild.exe" %SlnPath% /t:clean >>%STDOUT_DEFAULT%
@"C:\Program Files (x86)\MSBuild\12.0\Bin\MSBuild.exe" %SlnPath% >>%STDOUT_DEFAULT%
@call "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" %SlnPath% /t:clean >>%STDOUT_DEFAULT%
if %errorlevel% neq 0 (
echo ERROR: MSbuild: Compilation / Build Error
exit /b %errorlevel%
)
@call "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" %SlnPath% >>%STDOUT_DEFAULT%
if %errorlevel% neq 0 (
echo ERROR: MSbuild: Compilation / Build Error
exit /b %errorlevel%
)

IF EXIST "SwdPageRecorder_Latest" rd SwdPageRecorder_Latest /Q /S >>%STDOUT_DEFAULT%
md SwdPageRecorder_Latest >>%STDOUT_DEFAULT%
Expand All @@ -40,7 +48,12 @@ set MERGE_LIBS2=%SwdUiPath%\RazorEngine.dll %SwdUiPath%\System.Web.Razor.dll %Sw
set MERGE_LIBS3=%SwdUiPath%\ClearScript.dll


ilmerge\ILMerge.exe /targetplatform:"v4,C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5" /t:winexe /out:SwdPageRecorder_Latest\SwdPageRecorder.exe %SwdUiPath%\SwdPageRecorder.UI.exe %MERGE_LIBS1% %MERGE_LIBS2% %MERGE_LIBS3% >>%STDOUT_DEFAULT%
call ilmerge\ILMerge.exe /targetplatform:"v4,C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5" /t:winexe /out:SwdPageRecorder_Latest\SwdPageRecorder.exe %SwdUiPath%\SwdPageRecorder.UI.exe %MERGE_LIBS1% %MERGE_LIBS2% %MERGE_LIBS3% >>%STDOUT_DEFAULT%

if %errorlevel% neq 0 (
echo ERROR: ILMerge Error
exit /b %errorlevel%
)

@REM Remove SwdPageRecorder.pdb
del /F /Q SwdPageRecorder_Latest\SwdPageRecorder.pdb
Expand Down

0 comments on commit a6cf1d4

Please sign in to comment.