Tera TermRevision: 9816
https://osdn.net/projects/ttssh2/scm/svn/commits/9816
Author: zmatsuo
Date: 2022-03-16 00:47:25 +0900 (Wed, 16 Mar 2022)
Log Message:
-----------
AppVeyor で installer/release.bat をつかってビルドできるようにした
- AppVeyor では pause しないよう修正
- 通常はコンソールが消えないように pause する
- AppVeyor では常に日本語ヘルプをコンパイルするよう修正
- 通常は日本語 Windows 以外では、日本語ヘルプをコンパイルしない
Modified Paths:
--------------
trunk/doc/makechm.bat
trunk/installer/release.bat
Added Paths:
-----------
trunk/ci_scripts/appveyor_release_bat.yml
trunk/ci_scripts/build_appveyor_release_bat.bat
-------------- next part --------------
Added: trunk/ci_scripts/appveyor_release_bat.yml
===================================================================
--- trunk/ci_scripts/appveyor_release_bat.yml (rev 0)
+++ trunk/ci_scripts/appveyor_release_bat.yml 2022-03-15 15:47:25 UTC (rev 9816)
@@ -0,0 +1,24 @@
+image: Visual Studio 2019
+
+environment:
+ APPVEYOR_SAVE_CACHE_ON_ERROR: true
+
+build: off
+
+init:
+ - c:\cygwin64\setup-x86_64.exe --quiet-mode --packages cmake --packages cygwin32-gcc-g++ --packages cygwin32-gcc-core
+
+cache:
+ - libs
+
+build_script:
+ - ci_scripts/build_appveyor_release_bat.bat
+
+artifacts:
+ - path: installer/Output/*.exe
+ - path: installer/Output/*.zip
+
+on_success:
+ - ci_scripts\notify.bat success
+on_failure:
+ - ci_scripts\notify.bat failure
Added: trunk/ci_scripts/build_appveyor_release_bat.bat
===================================================================
--- trunk/ci_scripts/build_appveyor_release_bat.bat (rev 0)
+++ trunk/ci_scripts/build_appveyor_release_bat.bat 2022-03-15 15:47:25 UTC (rev 9816)
@@ -0,0 +1,4 @@
+set CUR=%~dp0
+cd /d %CUR%..
+call ci_scripts\install.bat
+call installer\release.bat 2
Modified: trunk/doc/makechm.bat
===================================================================
--- trunk/doc/makechm.bat 2022-03-15 15:47:13 UTC (rev 9815)
+++ trunk/doc/makechm.bat 2022-03-15 15:47:25 UTC (rev 9816)
@@ -15,8 +15,10 @@
CALL convtext.bat
REM Check Japanese version Windows
-chcp | find "932" > NUL
-if ERRORLEVEL 1 goto English
+if not "%APPVEYOR%" == "True" (
+ chcp | find "932" > NUL
+ if ERRORLEVEL 1 goto English
+)
for /f "delims=" %%i in ('perl htmlhelp_update_check.pl ja teratermj.chm') do @set updated=%%i
if "%updated%"=="updated" (
Modified: trunk/installer/release.bat
===================================================================
--- trunk/installer/release.bat 2022-03-15 15:47:13 UTC (rev 9815)
+++ trunk/installer/release.bat 2022-03-15 15:47:25 UTC (rev 9816)
@@ -14,6 +14,8 @@
set ARGON2_VERSION=20190702
set LIBRESSL_VERSION=3.4.2
+if "%APPVEYOR%" == "" set NOPAUSE=1
+
call :setup_tools_env
echo =======
@@ -65,7 +67,7 @@
call :check_tools
)
-pause
+if "%NOPAUSE" == "" pause
exit 0
@@ -221,7 +223,7 @@
set PERL=C:\cygwin\usr\bin\perl.exe
if exist %PERL% exit /b 0
echo perl not found
-pause
+if "%NOPAUSE" == "" pause
exit
rem ####################
@@ -241,7 +243,7 @@
set SVN="%SVN_PATH%\svn.exe"
if exist %SVN% exit /b 0
echo svn not found
-pause
+if "%NOPAUSE" == "" pause
exit
rem ####################
@@ -260,7 +262,7 @@
set CMAKE="%CMAKE_PATH%\cmake.exe"
if exist %CMAKE% exit /b 0
echo cmake not found
-pause
+if "%NOPAUSE" == "" pause
exit
rem ####################
@@ -279,7 +281,7 @@
if exist %INNO_SETUP% exit /b 0
:search_iscc_not_found
echo iscc(inno setup) not found
-pause
+if "%NOPAUSE" == "" pause
exit
rem ####################
@@ -287,14 +289,21 @@
if exist "%VS_BASE%\Community" (
call "%VS_BASE%\Community\VC\Auxiliary\Build\vcvars32.bat"
+ exit /b 0
)
if exist "%VS_BASE%\Professional" (
call "%VS_BASE%\Profssional\VC\Auxiliary\Build\vcvars32.bat"
+ exit /b 0
)
if exist "%VS_BASE%\Enterprise" (
call "%VS_BASE%\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+ exit /b 0
)
-exit /b 0
+:vs_not_found
+echo Visual Studio not found
+echo VS_BASE=%VS_BASE%
+if "%NOPAUSE" == "" pause
+exit
rem ####################
:exec_cmd