Tera TermRevision: 10846
https://osdn.net/projects/ttssh2/scm/svn/commits/10846
Author: zmatsuo
Date: 2023-08-16 00:04:06 +0900 (Wed, 16 Aug 2023)
Log Message:
-----------
cmakeビルドでうまくビルドできなくなっていたので修正
- r10824 PuTTY のソースの入手についての調整
- PuTTY-LICENSE.txt をコピーしなくなった
- r10829 不要になった CNF ファイルを削除
- EDITOR.CNF 等がなくなったので修正
- zip, setup を作成するコマンドを build_with_cmake.md に追記
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/10824
https://osdn.net/projects/ttssh2/scm/svn/commits/10829
Modified Paths:
--------------
trunk/doc/en/CMakeLists.txt
trunk/doc/en/html/reference/build_with_cmake.md
trunk/doc/ja/CMakeLists.txt
trunk/doc/ja/html/reference/build_with_cmake.md
trunk/installer/CMakeLists.txt
trunk/installer/teraterm_cmake.iss.in
-------------- next part --------------
Modified: trunk/doc/en/CMakeLists.txt
===================================================================
--- trunk/doc/en/CMakeLists.txt 2023-08-15 13:46:20 UTC (rev 10845)
+++ trunk/doc/en/CMakeLists.txt 2023-08-15 15:04:06 UTC (rev 10846)
@@ -28,7 +28,6 @@
ConvertHTML(${REF}/Oniguruma-LICENSE.txt ../../libs/doc_help/Oniguruma-LICENSE.txt "-l;unix")
ConvertHTML(${REF}/RE.txt ../../libs/doc_help/en/RE "-l;unix;-c;utf8")
ConvertHTML(${REF}/LibreSSL-LICENSE.txt ../../libs/doc_help/LibreSSL-LICENSE.txt "-l;unix")
-ConvertHTML(${REF}/PuTTY-LICENSE.txt ../../libs/doc_help/PuTTY-LICENSE.txt "-l;crlf")
ConvertHTML(${REF}/SFMT-LICENSE.txt ../../libs/doc_help/SFMT-LICENSE.txt "-l;unix")
ConvertHTML(${REF}/argon2-LICENSE.txt ../../libs/doc_help/argon2-LICENSE.txt "-l;unix")
ConvertHTML(${REF}/zlib-LICENSE.txt ../../libs/doc_help/zlib-LICENSE.txt "-l;unix;--zlib_special")
Modified: trunk/doc/en/html/reference/build_with_cmake.md
===================================================================
--- trunk/doc/en/html/reference/build_with_cmake.md 2023-08-15 13:46:20 UTC (rev 10845)
+++ trunk/doc/en/html/reference/build_with_cmake.md 2023-08-15 15:04:06 UTC (rev 10846)
@@ -27,6 +27,12 @@
cmake .. -G "Visual Stuido 17 2022" -A Win32
cmake --build . --config Release -j
```
+To build installer
+```
+cmake --build . --config Release --target Install
+cmake --build . --config Release --target inno_setup
+cmake --build . --config Release --target zip
+```
### NMake (Visual Studio, very experimental)
Modified: trunk/doc/ja/CMakeLists.txt
===================================================================
--- trunk/doc/ja/CMakeLists.txt 2023-08-15 13:46:20 UTC (rev 10845)
+++ trunk/doc/ja/CMakeLists.txt 2023-08-15 15:04:06 UTC (rev 10846)
@@ -28,7 +28,6 @@
ConvertHTML(${REF}/Oniguruma-LICENSE.txt ../../libs/doc_help/Oniguruma-LICENSE.txt "-l;unix")
ConvertHTML(${REF}/RE.txt ../../libs/doc_help/ja/RE "-l;unix;-c;utf8")
ConvertHTML(${REF}/LibreSSL-LICENSE.txt ../../libs/doc_help/LibreSSL-LICENSE.txt "-l;unix")
-ConvertHTML(${REF}/PuTTY-LICENSE.txt ../../libs/doc_help/PuTTY-LICENSE.txt "-l;crlf")
ConvertHTML(${REF}/SFMT-LICENSE.txt ../../libs/doc_help/SFMT-LICENSE.txt "-l;unix")
ConvertHTML(${REF}/argon2-LICENSE.txt ../../libs/doc_help/argon2-LICENSE.txt "-l;unix")
ConvertHTML(${REF}/zlib-LICENSE.txt ../../libs/doc_help/zlib-LICENSE.txt "-l;unix;--zlib_special")
Modified: trunk/doc/ja/html/reference/build_with_cmake.md
===================================================================
--- trunk/doc/ja/html/reference/build_with_cmake.md 2023-08-15 13:46:20 UTC (rev 10845)
+++ trunk/doc/ja/html/reference/build_with_cmake.md 2023-08-15 15:04:06 UTC (rev 10846)
@@ -28,6 +28,12 @@
cmake .. -G "Visual Stuido 17 2022" -A Win32
cmake --build . --config Release -j
```
+インストーラを作成する
+```
+cmake --build . --config Release --target Install
+cmake --build . --config Release --target inno_setup
+cmake --build . --config Release --target zip
+```
### NMake (Visual Studio, very experimental)
Modified: trunk/installer/CMakeLists.txt
===================================================================
--- trunk/installer/CMakeLists.txt 2023-08-15 13:46:20 UTC (rev 10845)
+++ trunk/installer/CMakeLists.txt 2023-08-15 15:04:06 UTC (rev 10846)
@@ -44,7 +44,7 @@
)
install(
- FILES release/EDITOR.CNF
+ FILES release/IBMKEYB.CNF
DESTINATION .
RENAME KEYBOARD.CNF
)
Modified: trunk/installer/teraterm_cmake.iss.in
===================================================================
--- trunk/installer/teraterm_cmake.iss.in 2023-08-15 13:46:20 UTC (rev 10845)
+++ trunk/installer/teraterm_cmake.iss.in 2023-08-15 15:04:06 UTC (rev 10846)
@@ -70,12 +70,9 @@
Source: @CMAKE_INSTALL_PREFIX@/teraterm.chm; DestDir: {app}; Components: TeraTerm
Source: @CMAKE_INSTALL_PREFIX@/teratermj.chm; DestDir: {app}; Components: TeraTerm
Source: @PROJECT_SOURCE_DIR@/installer\release\license.txt; DestDir: {app}; Components: TeraTerm
-Source: @PROJECT_SOURCE_DIR@/installer\release\FUNCTION.CNF; DestDir: {app}; Components: TeraTerm
Source: @PROJECT_SOURCE_DIR@/installer\release\IBMKEYB.CNF; DestDir: {app}; Components: TeraTerm
-Source: @PROJECT_SOURCE_DIR@/installer\release\EDITOR.CNF; DestDir: {app}; Components: TeraTerm; DestName: KEYBOARD.CNF
-Source: @PROJECT_SOURCE_DIR@/installer\release\EDITOR.CNF; DestDir: {app}; Components: TeraTerm
-Source: @PROJECT_SOURCE_DIR@/installer\release\NT98KEYB.CNF; DestDir: {app}; Components: TeraTerm
-Source: @PROJECT_SOURCE_DIR@/installer\release\PC98KEYB.CNF; DestDir: {app}; Components: TeraTerm
+Source: @PROJECT_SOURCE_DIR@/installer\release\IBMKEYB.CNF; DestDir: {app}; Components: TeraTerm; DestName: KEYBOARD.CNF
+Source: @PROJECT_SOURCE_DIR@/installer\release\VT200.CNF; DestDir: {app}; Components: TeraTerm
Source: @CMAKE_INSTALL_PREFIX@/keycode.exe; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
Source: @CMAKE_INSTALL_PREFIX@/ttpmacro.exe; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
Source: @PROJECT_SOURCE_DIR@/installer\release\delpassw.ttl; DestDir: {app}; Components: TeraTerm