• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision9668 (tree)
Time2022-01-04 00:17:45
Authorzmatsuo

Log Message

Linuxでヘルプファイル(chm)を生成

- r9664 で chmcmd の指定に誤りがあったので修正
- AppVeyor で chmcmd をインストールするよう修正
- hhc.exe または chmcmd がある場合に chm を生成するよう修正

Change Summary

Incremental Difference

--- trunk/ci_scripts/appveyor_linux.md (revision 9667)
+++ trunk/ci_scripts/appveyor_linux.md (revision 9668)
@@ -21,6 +21,7 @@
2121 sudo apt-get -y upgrade
2222 sudo apt-get -y install cmake perl subversion
2323 sudo apt-get -y install g++-mingw-w64
24+sudo apt-get -y install fp-utils
2425 cd /path/to/teraterm
2526 ```
2627
--- trunk/ci_scripts/appveyor_linux.yml (revision 9667)
+++ trunk/ci_scripts/appveyor_linux.yml (revision 9668)
@@ -3,7 +3,7 @@
33 build: off
44
55 init:
6- - sudo apt-get -y install cmake perl subversion g++-mingw-w64
6+ - sudo apt-get -y install cmake perl subversion g++-mingw-w64 fp-utils
77
88 cache:
99 - libs
--- trunk/doc/CMakeLists.txt (revision 9667)
+++ trunk/doc/CMakeLists.txt (revision 9668)
@@ -6,12 +6,20 @@
66 HINTS "$ENV{ProgramFiles}/HTML Help Workshop"
77 HINTS "$ENV{ProgramFiles\(x86\)}/HTML Help Workshop"
88 )
9+ find_program(
10+ CHMCMD chmcmd
11+ HINTS ${CMAKE_CURRENT_LIST_DIR}/../buildtools/chmcmd/
12+ )
913 else()
1014 set(HHC "HHC-NOTFOUND")
15+ find_program(
16+ CHMCMD chmcmd2
17+ )
1118 endif()
1219 message("hhc=${HHC}")
1320
14-if (NOT("${PERL}" STREQUAL "PERL-NOTFOUND") AND NOT("${HHC}" STREQUAL "HHC-NOTFOUND"))
21+if (NOT("${PERL}" STREQUAL "PERL-NOTFOUND")
22+ AND (NOT(("${HHC}" STREQUAL "HHC-NOTFOUND") AND "${CHMCMD}" STREQUAL "CHMCMD-NOTFOUND")))
1523 file(
1624 GLOB_RECURSE
1725 SRC_EN
Show on old repository browser