[10408] インストーラから32bit版cygtermを外した (ttssh2-commit) - Tera Term

Revision: 10408
          https://osdn.net/projects/ttssh2/scm/svn/commits/10408
Author:   zmatsuo
Date:     2022-12-12 00:54:41 +0900 (Mon, 12 Dec 2022)
Log Message:
-----------
インストーラから32bit版cygtermを外した

- cygwin 3.4.0-1 (2022-12-04リリース) から32bit Windows サポートがなくなった
  - 32bit cygwin用実行ファイルを作るためのパッケージがなくなった
    - cygwin32-gcc-g++, cygwin32-gcc-core
    - ci_scripts/build_appveyor.bat でインストールするのをやめた
- 32bit cygwin用実行ファイルを作成するgcc,g++がない場合でもビルドできるようにした
- installer\release.bat 終了時に bat だけが終了するようにした

Modified Paths:
--------------
    trunk/ci_scripts/build_appveyor.bat
    trunk/installer/build.bat
    trunk/installer/makearchive.bat
    trunk/installer/release.bat
    trunk/installer/teraterm.iss
    trunk/installer/teraterm_cmake.iss.in

-------------- next part --------------
Modified: trunk/ci_scripts/build_appveyor.bat
===================================================================

--- trunk/ci_scripts/build_appveyor.bat	2022-12-11 15:54:31 UTC (rev 10407)
+++ trunk/ci_scripts/build_appveyor.bat	2022-12-11 15:54:41 UTC (rev 10408)
@@ -4,7 +4,8 @@
 call buildtools\svnrev\svnrev.bat
 call buildtools\svnrev\sourcetree_info.bat
 if exist c:\cygwin64\setup-x86_64.exe (
-  c:\cygwin64\setup-x86_64.exe --quiet-mode --packages cmake --packages cygwin32-gcc-g++ --packages cygwin32-gcc-core
+  c:\cygwin64\setup-x86_64.exe --quiet-mode --packages cmake
+  rem c:\cygwin64\setup-x86_64.exe --quiet-mode --packages cygwin32-gcc-g++ --packages cygwin32-gcc-core
 )
 if exist c:\msys64\usr\bin\pacman.exe (
   c:\msys64\usr\bin\pacman.exe  -S --noconfirm --needed cmake

Modified: trunk/installer/build.bat
===================================================================
--- trunk/installer/build.bat	2022-12-11 15:54:31 UTC (rev 10407)
+++ trunk/installer/build.bat	2022-12-11 15:54:41 UTC (rev 10408)
@@ -222,7 +222,9 @@
     make cygterm+-i686-clean
 )
 make cygterm+-x86_64 -j
+if not exist c:\cygwin64\bin\i686-pc-cygwin-g++.exe goto cygterm32_pass
 make cygterm+-i686 -j
+:cygterm32_pass
 make archive
 popd
 

Modified: trunk/installer/makearchive.bat
===================================================================
--- trunk/installer/makearchive.bat	2022-12-11 15:54:31 UTC (rev 10407)
+++ trunk/installer/makearchive.bat	2022-12-11 15:54:41 UTC (rev 10408)
@@ -36,8 +36,10 @@
 copy /y ..\ttssh2\ttxssh\Release\ttxssh.dll %dst%
 copy /y ..\cygwin\cygterm\cygterm.cfg %dst%
 copy /y "..\cygwin\cygterm\cygterm+.tar.gz" %dst%
+if not exist ..\cygwin\cygterm\cygterm+-i686\cygterm.exe goto cygwin32_pass
 mkdir "%dst%\cygterm+-i686"
 copy /y "..\cygwin\cygterm\cygterm+-i686\cygterm.exe" "%dst%\cygterm+-i686"
+:cygwin32_pass
 mkdir "%dst%\cygterm+-x86_64"
 copy /y "..\cygwin\cygterm\cygterm+-x86_64\cygterm.exe" "%dst%\cygterm+-x86_64"
 copy /y "..\cygwin\cygterm\cygterm+-x86_64\cygterm.exe" %dst%

Modified: trunk/installer/release.bat
===================================================================
--- trunk/installer/release.bat	2022-12-11 15:54:31 UTC (rev 10407)
+++ trunk/installer/release.bat	2022-12-11 15:54:41 UTC (rev 10408)
@@ -68,7 +68,7 @@
 )
 
 if not "%NOPAUSE%" == "1" pause
-exit 0
+exit /b 0
 
 
 rem ####################

Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2022-12-11 15:54:31 UTC (rev 10407)
+++ trunk/installer/teraterm.iss	2022-12-11 15:54:41 UTC (rev 10408)
@@ -110,7 +110,7 @@
 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
+;Source: ..\cygwin\cygterm\cygterm+-i686\cygterm.exe; DestDir: {app}\cygterm+-i686; Components: cygterm
 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
@@ -180,7 +180,7 @@
 ; Cygterm Here from folder Background
 ; MinVersion 5.00.0000 = not Win9x, 6.0.6000 = Vista or later
 Root: HKCU; Subkey: Software\Classes\Directory\Background\shell\cygterm; ValueType: string; ValueData: Cy&gterm Here; Flags: uninsdeletekey; Components: cygterm; Tasks: cygtermhere; MinVersion: 5.00.0000,6.0.6000
-Root: HKCU; Subkey: Software\Classes\Directory\Background\shell\cygterm; ValueType: string; ValueName: Icon; ValueData: """{app}\cyglaunch.exe"""; Flags: uninsdeletekey; Components: cygterm; Tasks: cygtermhere; MinVersion: 5.00.0000,6.0.6000	
+Root: HKCU; Subkey: Software\Classes\Directory\Background\shell\cygterm; ValueType: string; ValueName: Icon; ValueData: """{app}\cyglaunch.exe"""; Flags: uninsdeletekey; Components: cygterm; Tasks: cygtermhere; MinVersion: 5.00.0000,6.0.6000
 Root: HKCU; Subkey: Software\Classes\Directory\Background\shell\cygterm\command; ValueType: string; ValueData: """{app}\cyglaunch.exe"" -nocd -v CHERE_INVOKING=y -d ""\""%V\"""""; Flags: uninsdeletekey; Components: cygterm; Tasks: cygtermhere; MinVersion: 5.00.0000,6.0.6000
 Root: HKCU; Subkey: Software\Classes\LibraryFolder\Background\shell\cygterm; ValueType: string; ValueData: Cy&gterm Here; Flags: uninsdeletekey; Components: cygterm; Tasks: cygtermhere; MinVersion: 5.00.0000,6.0.6000
 Root: HKCU; Subkey: Software\Classes\LibraryFolder\Background\shell\cygterm; ValueType: string; ValueName: Icon; ValueData: """{app}\cyglaunch.exe"""; Flags: uninsdeletekey; Components: cygterm; Tasks: cygtermhere; MinVersion: 5.00.0000,6.0.6000

Modified: trunk/installer/teraterm_cmake.iss.in
===================================================================
--- trunk/installer/teraterm_cmake.iss.in	2022-12-11 15:54:31 UTC (rev 10407)
+++ trunk/installer/teraterm_cmake.iss.in	2022-12-11 15:54:41 UTC (rev 10408)
@@ -110,7 +110,7 @@
 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
+;Source: @CMAKE_INSTALL_PREFIX@/cygterm+-i686\cygterm.exe; DestDir: {app}\cygterm+-i686; Components: cygterm
 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


Tera Term

[ttssh2-commit] [10408] インストーラから32bit版cygtermを外した