Tera TermRevision: 9668
https://osdn.net/projects/ttssh2/scm/svn/commits/9668
Author: zmatsuo
Date: 2022-01-04 00:17:45 +0900 (Tue, 04 Jan 2022)
Log Message:
-----------
Linuxでヘルプファイル(chm)を生成
- r9664 で chmcmd の指定に誤りがあったので修正
- AppVeyor で chmcmd をインストールするよう修正
- hhc.exe または chmcmd がある場合に chm を生成するよう修正
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/9664
Modified Paths:
--------------
trunk/ci_scripts/appveyor_linux.md
trunk/ci_scripts/appveyor_linux.yml
trunk/doc/CMakeLists.txt
trunk/doc/makechm.cmake
-------------- next part --------------
Modified: trunk/ci_scripts/appveyor_linux.md
===================================================================
--- trunk/ci_scripts/appveyor_linux.md 2022-01-03 10:31:54 UTC (rev 9667)
+++ trunk/ci_scripts/appveyor_linux.md 2022-01-03 15:17:45 UTC (rev 9668)
@@ -21,6 +21,7 @@
sudo apt-get -y upgrade
sudo apt-get -y install cmake perl subversion
sudo apt-get -y install g++-mingw-w64
+sudo apt-get -y install fp-utils
cd /path/to/teraterm
```
Modified: trunk/ci_scripts/appveyor_linux.yml
===================================================================
--- trunk/ci_scripts/appveyor_linux.yml 2022-01-03 10:31:54 UTC (rev 9667)
+++ trunk/ci_scripts/appveyor_linux.yml 2022-01-03 15:17:45 UTC (rev 9668)
@@ -3,7 +3,7 @@
build: off
init:
- - sudo apt-get -y install cmake perl subversion g++-mingw-w64
+ - sudo apt-get -y install cmake perl subversion g++-mingw-w64 fp-utils
cache:
- libs
Modified: trunk/doc/CMakeLists.txt
===================================================================
--- trunk/doc/CMakeLists.txt 2022-01-03 10:31:54 UTC (rev 9667)
+++ trunk/doc/CMakeLists.txt 2022-01-03 15:17:45 UTC (rev 9668)
@@ -6,12 +6,20 @@
HINTS "$ENV{ProgramFiles}/HTML Help Workshop"
HINTS "$ENV{ProgramFiles\(x86\)}/HTML Help Workshop"
)
+ find_program(
+ CHMCMD chmcmd
+ HINTS ${CMAKE_CURRENT_LIST_DIR}/../buildtools/chmcmd/
+ )
else()
set(HHC "HHC-NOTFOUND")
+ find_program(
+ CHMCMD chmcmd2
+ )
endif()
message("hhc=${HHC}")
-if (NOT("${PERL}" STREQUAL "PERL-NOTFOUND") AND NOT("${HHC}" STREQUAL "HHC-NOTFOUND"))
+if (NOT("${PERL}" STREQUAL "PERL-NOTFOUND")
+ AND (NOT(("${HHC}" STREQUAL "HHC-NOTFOUND") AND "${CHMCMD}" STREQUAL "CHMCMD-NOTFOUND")))
file(
GLOB_RECURSE
SRC_EN
Modified: trunk/doc/makechm.cmake
===================================================================
--- trunk/doc/makechm.cmake 2022-01-03 10:31:54 UTC (rev 9667)
+++ trunk/doc/makechm.cmake 2022-01-03 15:17:45 UTC (rev 9668)
@@ -26,9 +26,8 @@
PERL perl
)
set(HHC "HHC-NOTFOUND")
- # "apt-get install fp-utils" to install chmcmd
find_program(
- CHMCMD chmcmd2
+ CHMCMD chmcmd
)
endif(CMAKE_HOST_WIN32)