• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision9816 (tree)
Time2022-03-16 00:47:25
Authorzmatsuo

Log Message

AppVeyor で installer/release.bat をつかってビルドできるようにした

- AppVeyor では pause しないよう修正

- 通常はコンソールが消えないように pause する

- AppVeyor では常に日本語ヘルプをコンパイルするよう修正

- 通常は日本語 Windows 以外では、日本語ヘルプをコンパイルしない

Change Summary

Incremental Difference

--- trunk/ci_scripts/appveyor_release_bat.yml (nonexistent)
+++ trunk/ci_scripts/appveyor_release_bat.yml (revision 9816)
@@ -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
--- trunk/ci_scripts/build_appveyor_release_bat.bat (nonexistent)
+++ trunk/ci_scripts/build_appveyor_release_bat.bat (revision 9816)
@@ -0,0 +1,4 @@
1+set CUR=%~dp0
2+cd /d %CUR%..
3+call ci_scripts\install.bat
4+call installer\release.bat 2
--- trunk/doc/makechm.bat (revision 9815)
+++ trunk/doc/makechm.bat (revision 9816)
@@ -15,8 +15,10 @@
1515 CALL convtext.bat
1616
1717 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+)
2022
2123 for /f "delims=" %%i in ('perl htmlhelp_update_check.pl ja teratermj.chm') do @set updated=%%i
2224 if "%updated%"=="updated" (
--- trunk/installer/release.bat (revision 9815)
+++ trunk/installer/release.bat (revision 9816)
@@ -14,6 +14,8 @@
1414 set ARGON2_VERSION=20190702
1515 set LIBRESSL_VERSION=3.4.2
1616
17+if "%APPVEYOR%" == "" set NOPAUSE=1
18+
1719 call :setup_tools_env
1820
1921 echo =======
@@ -65,7 +67,7 @@
6567 call :check_tools
6668 )
6769
68-pause
70+if "%NOPAUSE" == "" pause
6971 exit 0
7072
7173
@@ -221,7 +223,7 @@
221223 set PERL=C:\cygwin\usr\bin\perl.exe
222224 if exist %PERL% exit /b 0
223225 echo perl not found
224-pause
226+if "%NOPAUSE" == "" pause
225227 exit
226228
227229 rem ####################
@@ -241,7 +243,7 @@
241243 set SVN="%SVN_PATH%\svn.exe"
242244 if exist %SVN% exit /b 0
243245 echo svn not found
244-pause
246+if "%NOPAUSE" == "" pause
245247 exit
246248
247249 rem ####################
@@ -260,7 +262,7 @@
260262 set CMAKE="%CMAKE_PATH%\cmake.exe"
261263 if exist %CMAKE% exit /b 0
262264 echo cmake not found
263-pause
265+if "%NOPAUSE" == "" pause
264266 exit
265267
266268 rem ####################
@@ -279,7 +281,7 @@
279281 if exist %INNO_SETUP% exit /b 0
280282 :search_iscc_not_found
281283 echo iscc(inno setup) not found
282-pause
284+if "%NOPAUSE" == "" pause
283285 exit
284286
285287 rem ####################
@@ -287,14 +289,21 @@
287289
288290 if exist "%VS_BASE%\Community" (
289291 call "%VS_BASE%\Community\VC\Auxiliary\Build\vcvars32.bat"
292+ exit /b 0
290293 )
291294 if exist "%VS_BASE%\Professional" (
292295 call "%VS_BASE%\Profssional\VC\Auxiliary\Build\vcvars32.bat"
296+ exit /b 0
293297 )
294298 if exist "%VS_BASE%\Enterprise" (
295299 call "%VS_BASE%\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
300+ exit /b 0
296301 )
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
298307
299308 rem ####################
300309 :exec_cmd
Show on old repository browser