Tera TermRevision: 10410
https://osdn.net/projects/ttssh2/scm/svn/commits/10410
Author: zmatsuo
Date: 2022-12-13 23:43:03 +0900 (Tue, 13 Dec 2022)
Log Message:
-----------
32bit版cygterm.exeの有無にかかわらずインストーラを作成できるよう修正
- 32bit cygterm がビルドできていればインストーラに入る
- ビルドされていなければインストーラに入らない
- r10408
ticket #46267
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/10408
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/46267
Modified Paths:
--------------
trunk/installer/teraterm.iss
trunk/installer/teraterm_cmake.iss.in
-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss 2022-12-13 14:42:53 UTC (rev 10409)
+++ trunk/installer/teraterm.iss 2022-12-13 14:43:03 UTC (rev 10410)
@@ -110,7 +110,9 @@
Source: release\lang_utf16le\Traditional Chinese.lng; DestDir: {app}\lang_utf16le; Components: TeraTerm; Attribs: readonly; Flags: uninsremovereadonly overwritereadonly
Source: ..\ttssh2\ttxssh\Release\ttxssh.dll; DestDir: {app}; Components: TTSSH; Flags: ignoreversion
Source: release\ssh_known_hosts; DestDir: {app}; Components: TTSSH
-;Source: ..\cygwin\cygterm\cygterm+-i686\cygterm.exe; DestDir: {app}\cygterm+-i686; Components: cygterm
+#ifexist "..\cygwin\cygterm\cygterm+-i686\cygterm.exe"
+Source: ..\cygwin\cygterm\cygterm+-i686\cygterm.exe; DestDir: {app}\cygterm+-i686; Components: cygterm
+#endif
Source: ..\cygwin\cygterm\cygterm.cfg; DestDir: {app}; Components: cygterm
Source: ..\cygwin\cygterm\cygterm+.tar.gz; DestDir: {app}; Components: cygterm
Source: ..\cygwin\cygterm\cygterm+-x86_64\cygterm.exe; DestDir: {app}\cygterm+-x86_64; Components: cygterm
Modified: trunk/installer/teraterm_cmake.iss.in
===================================================================
--- trunk/installer/teraterm_cmake.iss.in 2022-12-13 14:42:53 UTC (rev 10409)
+++ trunk/installer/teraterm_cmake.iss.in 2022-12-13 14:43:03 UTC (rev 10410)
@@ -110,7 +110,9 @@
Source: @CMAKE_INSTALL_PREFIX@\lang_utf16le\Traditional Chinese.lng; DestDir: {app}\lang_utf16le; Components: TeraTerm; Attribs: readonly; Flags: uninsremovereadonly overwritereadonly
Source: @CMAKE_INSTALL_PREFIX@/ttxssh.dll; DestDir: {app}; Components: TTSSH; Flags: ignoreversion
Source: @PROJECT_SOURCE_DIR@/installer\release\ssh_known_hosts; DestDir: {app}; Components: TTSSH
-;Source: @CMAKE_INSTALL_PREFIX@/cygterm+-i686\cygterm.exe; DestDir: {app}\cygterm+-i686; Components: cygterm
+#ifexist "@CMAKE_INSTALL_PREFIX@/cygterm.exe"
+Source: @CMAKE_INSTALL_PREFIX@/cygterm+-i686\cygterm.exe; DestDir: {app}\cygterm+-i686; Components: cygterm
+#endif
Source: @CMAKE_INSTALL_PREFIX@/cygterm.cfg; DestDir: {app}; Components: cygterm
;Source: @CMAKE_INSTALL_PREFIX@/cygterm+.tar.gz; DestDir: {app}; Components: cygterm
Source: @CMAKE_INSTALL_PREFIX@/cygterm+-x86_64\cygterm.exe; DestDir: {app}\cygterm+-x86_64; Components: cygterm