AppVeyor で installer/release.bat をつかってビルドできるようにした
- AppVeyor では pause しないよう修正
- AppVeyor では常に日本語ヘルプをコンパイルするよう修正
@@ -0,0 +1,24 @@ | ||
1 | +image: Visual Studio 2019 | |
2 | + | |
3 | +environment: | |
4 | + APPVEYOR_SAVE_CACHE_ON_ERROR: true | |
5 | + | |
6 | +build: off | |
7 | + | |
8 | +init: | |
9 | + - c:\cygwin64\setup-x86_64.exe --quiet-mode --packages cmake --packages cygwin32-gcc-g++ --packages cygwin32-gcc-core | |
10 | + | |
11 | +cache: | |
12 | + - libs | |
13 | + | |
14 | +build_script: | |
15 | + - ci_scripts/build_appveyor_release_bat.bat | |
16 | + | |
17 | +artifacts: | |
18 | + - path: installer/Output/*.exe | |
19 | + - path: installer/Output/*.zip | |
20 | + | |
21 | +on_success: | |
22 | + - ci_scripts\notify.bat success | |
23 | +on_failure: | |
24 | + - ci_scripts\notify.bat failure |
@@ -0,0 +1,4 @@ | ||
1 | +set CUR=%~dp0 | |
2 | +cd /d %CUR%.. | |
3 | +call ci_scripts\install.bat | |
4 | +call installer\release.bat 2 |
@@ -15,8 +15,10 @@ | ||
15 | 15 | CALL convtext.bat |
16 | 16 | |
17 | 17 | REM Check Japanese version Windows |
18 | -chcp | find "932" > NUL | |
19 | -if ERRORLEVEL 1 goto English | |
18 | +if not "%APPVEYOR%" == "True" ( | |
19 | + chcp | find "932" > NUL | |
20 | + if ERRORLEVEL 1 goto English | |
21 | +) | |
20 | 22 | |
21 | 23 | for /f "delims=" %%i in ('perl htmlhelp_update_check.pl ja teratermj.chm') do @set updated=%%i |
22 | 24 | if "%updated%"=="updated" ( |
@@ -14,6 +14,8 @@ | ||
14 | 14 | set ARGON2_VERSION=20190702 |
15 | 15 | set LIBRESSL_VERSION=3.4.2 |
16 | 16 | |
17 | +if "%APPVEYOR%" == "" set NOPAUSE=1 | |
18 | + | |
17 | 19 | call :setup_tools_env |
18 | 20 | |
19 | 21 | echo ======= |
@@ -65,7 +67,7 @@ | ||
65 | 67 | call :check_tools |
66 | 68 | ) |
67 | 69 | |
68 | -pause | |
70 | +if "%NOPAUSE" == "" pause | |
69 | 71 | exit 0 |
70 | 72 | |
71 | 73 |
@@ -221,7 +223,7 @@ | ||
221 | 223 | set PERL=C:\cygwin\usr\bin\perl.exe |
222 | 224 | if exist %PERL% exit /b 0 |
223 | 225 | echo perl not found |
224 | -pause | |
226 | +if "%NOPAUSE" == "" pause | |
225 | 227 | exit |
226 | 228 | |
227 | 229 | rem #################### |
@@ -241,7 +243,7 @@ | ||
241 | 243 | set SVN="%SVN_PATH%\svn.exe" |
242 | 244 | if exist %SVN% exit /b 0 |
243 | 245 | echo svn not found |
244 | -pause | |
246 | +if "%NOPAUSE" == "" pause | |
245 | 247 | exit |
246 | 248 | |
247 | 249 | rem #################### |
@@ -260,7 +262,7 @@ | ||
260 | 262 | set CMAKE="%CMAKE_PATH%\cmake.exe" |
261 | 263 | if exist %CMAKE% exit /b 0 |
262 | 264 | echo cmake not found |
263 | -pause | |
265 | +if "%NOPAUSE" == "" pause | |
264 | 266 | exit |
265 | 267 | |
266 | 268 | rem #################### |
@@ -279,7 +281,7 @@ | ||
279 | 281 | if exist %INNO_SETUP% exit /b 0 |
280 | 282 | :search_iscc_not_found |
281 | 283 | echo iscc(inno setup) not found |
282 | -pause | |
284 | +if "%NOPAUSE" == "" pause | |
283 | 285 | exit |
284 | 286 | |
285 | 287 | rem #################### |
@@ -287,14 +289,21 @@ | ||
287 | 289 | |
288 | 290 | if exist "%VS_BASE%\Community" ( |
289 | 291 | call "%VS_BASE%\Community\VC\Auxiliary\Build\vcvars32.bat" |
292 | + exit /b 0 | |
290 | 293 | ) |
291 | 294 | if exist "%VS_BASE%\Professional" ( |
292 | 295 | call "%VS_BASE%\Profssional\VC\Auxiliary\Build\vcvars32.bat" |
296 | + exit /b 0 | |
293 | 297 | ) |
294 | 298 | if exist "%VS_BASE%\Enterprise" ( |
295 | 299 | call "%VS_BASE%\Enterprise\VC\Auxiliary\Build\vcvars32.bat" |
300 | + exit /b 0 | |
296 | 301 | ) |
297 | -exit /b 0 | |
302 | +:vs_not_found | |
303 | +echo Visual Studio not found | |
304 | +echo VS_BASE=%VS_BASE% | |
305 | +if "%NOPAUSE" == "" pause | |
306 | +exit | |
298 | 307 | |
299 | 308 | rem #################### |
300 | 309 | :exec_cmd |