• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision9294 (tree)
Time2021-05-29 00:43:01
Authorzmatsuo

Log Message

ヘルプファイル内に生成に失敗したページがあったので修正

- libs/doc_help/ にあるファイルからヘルプ用ファイルを生成するよう修正
- 2sjis.pl 入力ファイルがオープンできなかった時エラーが出るようにした

Change Summary

Incremental Difference

--- trunk/doc/.gitignore (revision 9293)
+++ trunk/doc/.gitignore (revision 9294)
@@ -4,3 +4,6 @@
44 ja/Index.hhk
55 ja/teratermj.chm
66 ja/teratermj.chm.rule
7+*.txt
8+*.md
9+*.html
--- trunk/doc/CMakeLists.txt (revision 9293)
+++ trunk/doc/CMakeLists.txt (revision 9294)
@@ -51,13 +51,13 @@
5151
5252 add_custom_command(
5353 OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/en/teraterm.chm
54- COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/oniguruma/COPYING -o en/html/reference/Oniguruma-LICENSE.txt -l unix
55- COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/oniguruma/doc/RE.ja -o en/html/reference/RE.txt -c utf8 -l unix
56- COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/openssl/LICENSE -o en/html/reference/OpenSSL-LICENSE.txt -l unix
57- COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/putty/LICENCE -o en/html/reference/PuTTY-LICENSE.txt -l crlf
58- COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/SFMT/LICENSE.txt -o en/html/reference/SFMT-LICENSE.txt -l unix
59- COMMAND ${PERL} ../installer/2sjis.pl -i ../cygterm/COPYING -o en/html/reference/CygTerm+-LICENSE.txt -l unix
60- COMMAND ${PERL} ../installer/copy-zliblicense.pl -i ../libs/zlib/README -o en/html/reference/zlib-LICENSE.txt -l unix
54+ COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/Oniguruma-LICENSE.txt -o en/html/reference/Oniguruma-LICENSE.txt -l unix
55+ COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/en/RE -o en/html/reference/RE.txt -c utf8 -l unix
56+ COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/OpenSSL-LICENSE.txt -o en/html/reference/OpenSSL-LICENSE.txt -l unix
57+ COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/PuTTY-LICENSE.txt -o en/html/reference/PuTTY-LICENSE.txt -l crlf
58+ COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/SFMT-LICENSE.txt -o en/html/reference/SFMT-LICENSE.txt -l unix
59+ COMMAND ${PERL} ../installer/2sjis.pl -i ../cygterm/COPYING -o en/html/reference/CygTerm+-LICENSE.txt -l unix
60+ COMMAND ${PERL} ../installer/copy-zliblicense.pl -i ../libs/doc_help/zlib-LICENSE.txt -o en/html/reference/zlib-LICENSE.txt -l unix
6161 COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" en/html/reference/build_with_cmake.md > en/html/reference/build_with_cmake_no_bom.md
6262 COMMAND ${PERL} Markdown_1.0.1/Markdown.pl en/html/reference/build_with_cmake_no_bom.md > en/html/reference/build_with_cmake_utf8.html
6363 COMMAND ${PERL} ../installer/2sjis.pl -i en/html/reference/build_with_cmake_utf8.html -o en/html/reference/build_with_cmake.html -c utf8
@@ -64,6 +64,12 @@
6464 COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" en/html/reference/build_library_with_cmake.md > en/html/reference/build_library_with_cmake_no_bom.md
6565 COMMAND ${PERL} Markdown_1.0.1/Markdown.pl en/html/reference/build_library_with_cmake_no_bom.md > en/html/reference/build_library_with_cmake_utf8.html
6666 COMMAND ${PERL} ../installer/2sjis.pl -i en/html/reference/build_library_with_cmake_utf8.html -o en/html/reference/build_library_with_cmake.html -c utf8
67+ COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" en/html/reference/keyboard_cfg.md > en/html/reference/keyboard_cfg_no_bom.md
68+ COMMAND ${PERL} Markdown_1.0.1/Markdown.pl en/html/reference/keyboard_cfg_no_bom.md > en/html/reference/keyboard_cfg_utf8.html
69+ COMMAND ${PERL} ../installer/2sjis.pl -i en/html/reference/keyboard_cfg_utf8.html -o en/html/reference/keyboard_cfg.html -c utf8
70+ COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" en/html/reference/menu_id.md > en/html/reference/menu_id_no_bom.md
71+ COMMAND ${PERL} Markdown_1.0.1/Markdown.pl en/html/reference/menu_id_no_bom.md > en/html/reference/menu_id_utf8.html
72+ COMMAND ${PERL} ../installer/2sjis.pl -i en/html/reference/menu_id_utf8.html -o en/html/reference/menu_id.html -c utf8
6773 COMMAND ${PERL} htmlhelp_index_make.pl en html > en/Index.hhk
6874 COMMAND ${HHC} en/teraterm.hhp || (exit 0)
6975 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -72,11 +78,11 @@
7278
7379 add_custom_command(
7480 OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ja/teratermj.chm
75- COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/oniguruma/COPYING -o ja/html/reference/Oniguruma-LICENSE.txt -l unix
76- COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/oniguruma/doc/RE.ja -o ja/html/reference/RE.txt -c utf8 -l unix
77- COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/openssl/LICENSE -o ja/html/reference/OpenSSL-LICENSE.txt -l unix
78- COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/putty/LICENCE -o ja/html/reference/PuTTY-LICENSE.txt -l crlf
79- COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/SFMT/LICENSE.txt -o ja/html/reference/SFMT-LICENSE.txt -l unix
81+ COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/Oniguruma-LICENSE.txt -o ja/html/reference/Oniguruma-LICENSE.txt -l unix
82+ COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/ja/RE -o ja/html/reference/RE.txt -c utf8 -l unix
83+ COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/OpenSSL-LICENSE.txt -o ja/html/reference/OpenSSL-LICENSE.txt -l unix
84+ COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/PuTTY-LICENSE.txt -o ja/html/reference/PuTTY-LICENSE.txt -l crlf
85+ COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/SFMT-LICENSE.txt -o ja/html/reference/SFMT-LICENSE.txt -l unix
8086 COMMAND ${PERL} ../installer/2sjis.pl -i ../cygterm/COPYING -o ja/html/reference/CygTerm+-LICENSE.txt -l unix
8187 COMMAND ${PERL} ../installer/copy-zliblicense.pl -i ../libs/zlib/README -o ja/html/reference/zlib-LICENSE.txt -l unix
8288 COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" ja/html/reference/build_with_cmake.md > ja/html/reference/build_with_cmake_no_bom.md
@@ -85,6 +91,12 @@
8591 COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" ja/html/reference/build_library_with_cmake.md > ja/html/reference/build_library_with_cmake_no_bom.md
8692 COMMAND ${PERL} Markdown_1.0.1/Markdown.pl ja/html/reference/build_library_with_cmake_no_bom.md > ja/html/reference/build_library_with_cmake_utf8.html
8793 COMMAND ${PERL} ../installer/2sjis.pl -i ja/html/reference/build_library_with_cmake_utf8.html -o ja/html/reference/build_library_with_cmake.html -c utf8
94+ COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" ja/html/reference/keyboard_cfg.md > ja/html/reference/keyboard_cfg_no_bom.md
95+ COMMAND ${PERL} Markdown_1.0.1/Markdown.pl ja/html/reference/keyboard_cfg_no_bom.md > ja/html/reference/keyboard_cfg_utf8.html
96+ COMMAND ${PERL} ../installer/2sjis.pl -i ja/html/reference/keyboard_cfg_utf8.html -o ja/html/reference/keyboard_cfg.html -c utf8
97+ COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" ja/html/reference/menu_id.md > ja/html/reference/menu_id_no_bom.md
98+ COMMAND ${PERL} Markdown_1.0.1/Markdown.pl ja/html/reference/menu_id_no_bom.md > ja/html/reference/menu_id_utf8.html
99+ COMMAND ${PERL} ../installer/2sjis.pl -i ja/html/reference/menu_id_utf8.html -o ja/html/reference/menu_id.html -c utf8
88100 COMMAND ${PERL} htmlhelp_index_make.pl ja html > ja/Index.hhk
89101 COMMAND ${HHC} ja/teraterm.hhp || (exit 0)
90102 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--- trunk/installer/2sjis.pl (revision 9293)
+++ trunk/installer/2sjis.pl (revision 9294)
@@ -26,7 +26,7 @@
2626 binmode STDIN, ":$lf:encoding($coding)";
2727 $IN = *STDIN;
2828 } else {
29- open ($IN, "<:$lf:encoding($coding)", $in);
29+ open ($IN, "<:$lf:encoding($coding)", $in) or die("error :$! $in");
3030 }
3131 open (OUT, '>:crlf:encoding(shiftjis)', $out);
3232 while (<$IN>) {
Show on old repository browser