Skip to content

Commit

Permalink
Merge pull request sakura-editor#163 from m-tmatma/feature/refactor-b…
Browse files Browse the repository at this point in the history
…uild-solution

solution のビルドをバッチファイルの中で行う
  • Loading branch information
m-tmatma authored Jun 23, 2018
2 parents f01e09d + 53e5c0e commit 201a3a3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
9 changes: 1 addition & 8 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,7 @@ build_script:
echo CONFIGURATION %CONFIGURATION%
set EXTRA_CMD=/verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
set MSBUILD_EXE="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe"
echo %MSBUILD_EXE% %SLN_FILE% /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /t:"Clean","Rebuild" %EXTRA_CMD%
%MSBUILD_EXE% %SLN_FILE% /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /t:"Clean","Rebuild" %EXTRA_CMD%
call build-sln.bat %PLATFORM% %CONFIGURATION%
call build-chm.bat
Expand Down
18 changes: 18 additions & 0 deletions build-sln.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
set platform=%1
set configuration=%2

@rem https://www.appveyor.com/docs/environment-variables/

if "%APPVEYOR%"=="True" (
set EXTRA_CMD=/verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
) else (
set EXTRA_CMD=
)

set MSBUILD_EXE="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe"

@echo %MSBUILD_EXE% %SLN_FILE% /p:Platform=%platform% /p:Configuration=%configuration% /t:"Clean","Rebuild" %EXTRA_CMD%
%MSBUILD_EXE% %SLN_FILE% /p:Platform=%platform% /p:Configuration=%configuration% /t:"Clean","Rebuild" %EXTRA_CMD%
if %errorlevel% neq 0 (echo error && exit /b 1)

exit /b 0

0 comments on commit 201a3a3

Please sign in to comment.