[Ttssh2-commit] [8324] インストーラーに関するデフォルト動作の変更を元に戻した。

scmno****@osdn***** scmno****@osdn*****
2019年 10月 21日 (月) 00:05:05 JST


Revision: 8324
          https://osdn.net/projects/ttssh2/scm/svn/commits/8324
Author:   yutakapon
Date:     2019-10-21 00:05:05 +0900 (Mon, 21 Oct 2019)
Log Message:
-----------
インストーラーに関するデフォルト動作の変更を元に戻した。
お試しでの修正で合意したものではないので。

Modified Paths:
--------------
    branches/unicode_buf/installer/makearchive.bat
    branches/unicode_buf/installer/teraterm.iss

-------------- next part --------------
Modified: branches/unicode_buf/installer/makearchive.bat
===================================================================
--- branches/unicode_buf/installer/makearchive.bat	2019-10-20 15:02:57 UTC (rev 8323)
+++ branches/unicode_buf/installer/makearchive.bat	2019-10-20 15:05:05 UTC (rev 8324)
@@ -90,7 +90,7 @@
 copy /y release\EDITOR.CNF %dst%\KEYBOARD.CNF
 xcopy /s /e /y /i /exclude:archive-exclude.txt release\theme %dst%\theme
 xcopy /s /e /y /i /exclude:archive-exclude.txt release\plugin %dst%\plugin
-rem xcopy /s /e /y /i /exclude:archive-exclude.txt release\Collector %dst%\Collector
+xcopy /s /e /y /i /exclude:archive-exclude.txt release\Collector %dst%\Collector
 xcopy /s /e /y /i /exclude:archive-exclude.txt release\lang %dst%\lang
 xcopy /s /e /y /i /exclude:archive-exclude.txt release\lang_utf16le %dst%\lang_utf16le
 del /f %dst%\lang\English.lng

Modified: branches/unicode_buf/installer/teraterm.iss
===================================================================
--- branches/unicode_buf/installer/teraterm.iss	2019-10-20 15:02:57 UTC (rev 8323)
+++ branches/unicode_buf/installer/teraterm.iss	2019-10-20 15:05:05 UTC (rev 8324)
@@ -57,7 +57,7 @@
 Name: ja; MessagesFile: compiler:Languages\Japanese.isl
 
 [Dirs]
-;Name: {app}\Collector; Components: Collector
+Name: {app}\Collector; Components: Collector
 Name: {app}\theme; Components: TeraTerm
 Name: {app}\theme\scale; Components: TeraTerm
 Name: {app}\theme\tile; Components: TeraTerm
@@ -71,7 +71,7 @@
 Source: ..\teraterm\release\ttpset.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: ..\teraterm\release\ttptek.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: release\TERATERM.INI; DestDir: {app}; Components: TeraTerm; Flags: onlyifdoesntexist uninsneveruninstall; Permissions: authusers-modify
-Source: release\TSPECIAL1.TTF; DestDir: {app}; Components: TeraTerm
+Source: release\TSPECIAL1.TTF; DestDir: {fonts}; Components: TeraTerm; Attribs: readonly; Flags: overwritereadonly uninsneveruninstall; FontInstall: Tera Special; Check: isAbleToInstallFont
 Source: ..\doc\en\teraterm.chm; DestDir: {app}; Components: TeraTerm
 Source: ..\doc\ja\teratermj.chm; DestDir: {app}; Components: TeraTerm
 Source: release\license.txt; DestDir: {app}; Components: TeraTerm
@@ -107,8 +107,8 @@
 Source: ..\cygterm\cygterm+.tar.gz; DestDir: {app}; Components: cygterm
 Source: ..\cygterm\cygterm+-x86_64\cygterm.exe; DestDir: {app}\cygterm+-x86_64; Components: cygterm
 Source: cygtool\cygtool.dll; Components: cygterm; Flags: dontcopy
-;Source: ..\libs\logmett\Setup_LogMeTT_2_12_1.exe; DestDir: {tmp}; Components: LogMeTT; Flags: deleteafterinstall
-;Source: ..\libs\logmett\Setup_TTLEditor_1_5_1.exe; DestDir: {tmp}; Components: TTLEdit; Flags: deleteafterinstall
+Source: ..\libs\logmett\Setup_LogMeTT_2_12_1.exe; DestDir: {tmp}; Components: LogMeTT; Flags: deleteafterinstall
+Source: ..\libs\logmett\Setup_TTLEditor_1_5_1.exe; DestDir: {tmp}; Components: TTLEdit; Flags: deleteafterinstall
 Source: ..\ttpmenu\Release\ttpmenu.exe; DestDir: {app}; Components: TeraTerm_Menu; Flags: ignoreversion
 Source: release\ttmenu_readme-j.txt; DestDir: {app}; Components: TeraTerm_Menu
 Source: ..\TTProxy\Release\TTXProxy.dll; DestDir: {app}; Components: TTProxy; Flags: ignoreversion
@@ -122,13 +122,13 @@
 Source: release\theme\tile\44.jpg; DestDir: {app}\theme\tile; Components: TeraTerm
 Source: release\plugin\ttAKJpeg.dll; DestDir: {app}\plugin\; Components: TeraTerm
 Source: release\plugin\ttAKJpeg.txt; DestDir: {app}\plugin\; Components: TeraTerm
-;Source: release\Collector\Collector.exe; DestDir: {app}\Collector\; Components: Collector
-;Source: release\Collector\collector.ini; DestDir: {app}\Collector\; Components: Collector
-;Source: release\Collector\Collector_org.exe; DestDir: {app}\Collector\; Components: Collector
-;Source: release\Collector\hthook.dll; DestDir: {app}\Collector\; Components: Collector
-;Source: release\Collector\mfc70.dll; DestDir: {app}\Collector\; Components: Collector
-;Source: release\Collector\msvcr70.dll; DestDir: {app}\Collector\; Components: Collector
-;Source: release\Collector\readme.txt; DestDir: {app}\Collector\; Components: Collector
+Source: release\Collector\Collector.exe; DestDir: {app}\Collector\; Components: Collector
+Source: release\Collector\collector.ini; DestDir: {app}\Collector\; Components: Collector
+Source: release\Collector\Collector_org.exe; DestDir: {app}\Collector\; Components: Collector
+Source: release\Collector\hthook.dll; DestDir: {app}\Collector\; Components: Collector
+Source: release\Collector\mfc70.dll; DestDir: {app}\Collector\; Components: Collector
+Source: release\Collector\msvcr70.dll; DestDir: {app}\Collector\; Components: Collector
+Source: release\Collector\readme.txt; DestDir: {app}\Collector\; Components: Collector
 Source: ..\TTXKanjiMenu\release\ttxkanjimenu.dll; DestDir: {app}\; Components: Additional_Plugins/TTXKanjiMenu; Flags: ignoreversion
 Source: ..\TTXSamples\release\TTXResizeMenu.dll; DestDir: {app}\; Components: Additional_Plugins/TTXResizeMenu; Flags: ignoreversion
 Source: ..\TTXSamples\release\TTXttyrec.dll; DestDir: {app}\; Components: Additional_Plugins/TTXttyrec; Flags: ignoreversion
@@ -148,11 +148,11 @@
 Name: TeraTerm; Description: Tera Term & Macro; Flags: fixed; Types: custom compact full standard
 Name: TTSSH; Description: TTSSH; Types: compact full standard
 Name: cygterm; Description: CygTerm+; Types: full standard; Check: not isIA64
-;Name: LogMeTT; Description: LogMeTT ({cm:comp_installer}); Types: full; MinVersion: 4.1.1998,4.0.1381sp6
-;Name: TTLEdit; Description: TTLEdit ({cm:comp_installer}); Types: full; MinVersion: 4.1.1998,4.0.1381sp6
+Name: LogMeTT; Description: LogMeTT ({cm:comp_installer}); Types: full; MinVersion: 4.1.1998,4.0.1381sp6
+Name: TTLEdit; Description: TTLEdit ({cm:comp_installer}); Types: full; MinVersion: 4.1.1998,4.0.1381sp6
 Name: TeraTerm_Menu; Description: TeraTerm Menu; Types: full
 Name: TTProxy; Description: TTProxy; Types: full standard
-;Name: Collector; Description: Collector; Types: full
+Name: Collector; Description: Collector; Types: full
 Name: Additional_Plugins; Description: {cm:comp_TTX}
 Name: Additional_Plugins/TTXResizeMenu; Description: TTXResizeMenu ({cm:comp_TTXResizeMenu}); Types: full standard
 Name: Additional_Plugins/TTXttyrec; Description: TTXttyrec ({cm:comp_TTXttyrec}); Types: full standard
@@ -169,11 +169,11 @@
 Name: {group}\{cm:UninstallProgram,{#AppName}}; Filename: {uninstallexe}; Components: TeraTerm; Flags: createonlyiffileexists
 Name: {group}\cyglaunch; Filename: {app}\cyglaunch.exe; WorkingDir: {app}; IconFilename: {app}\cyglaunch.exe; IconIndex: 0; Components: cygterm; Flags: createonlyiffileexists
 Name: {group}\TeraTerm Menu; Filename: {app}\ttpmenu.exe; WorkingDir: {app}; IconFilename: {app}\ttpmenu.exe; IconIndex: 0; Components: TeraTerm_Menu; Flags: createonlyiffileexists
-;Name: {group}\Collector; Filename: {app}\Collector\Collector.exe; WorkingDir: {app}\Collector; IconFilename: {app}\Collector\Collector.exe; IconIndex: 0; Components: Collector; Flags: createonlyiffileexists
+Name: {group}\Collector; Filename: {app}\Collector\Collector.exe; WorkingDir: {app}\Collector; IconFilename: {app}\Collector\Collector.exe; IconIndex: 0; Components: Collector; Flags: createonlyiffileexists
 Name: {userdesktop}\Tera Term; Filename: {app}\ttermpro.exe; WorkingDir: {app}; IconFilename: {app}\ttermpro.exe; Components: TeraTerm; Tasks: desktopicon; IconIndex: 0; Flags: createonlyiffileexists
 Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Tera Term; Filename: {app}\ttermpro.exe; WorkingDir: {app}; IconFilename: {app}\ttermpro.exe; Components: TeraTerm; Tasks: quicklaunchicon; IconIndex: 0; Flags: createonlyiffileexists
 Name: {userstartup}\TeraTerm Menu; Filename: {app}\ttpmenu.exe; WorkingDir: {app}; IconFilename: {app}\ttpmenu.exe; Components: TeraTerm_Menu; IconIndex: 0; Tasks: startupttmenuicon; Flags: createonlyiffileexists
-;Name: {userstartup}\Collector; Filename: {app}\collector\collector.exe; WorkingDir: {app}\Collector; IconFilename: {app}\collector\collector.exe; Components: Collector; Tasks: startupcollectoricon; IconIndex: 0; Flags: createonlyiffileexists
+Name: {userstartup}\Collector; Filename: {app}\collector\collector.exe; WorkingDir: {app}\Collector; IconFilename: {app}\collector\collector.exe; Components: Collector; Tasks: startupcollectoricon; IconIndex: 0; Flags: createonlyiffileexists
 Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\cyglaunch; Filename: {app}\cyglaunch.exe; WorkingDir: {app}; IconFilename: {app}\cyglaunch.exe; Components: cygterm; Tasks: quickcyglaunch; IconIndex: 0; Flags: createonlyiffileexists
 
 [Registry]
@@ -238,7 +238,7 @@
 Name: desktopicon; Description: {cm:task_desktopicon}; Components: TeraTerm
 Name: quicklaunchicon; Description: {cm:task_quicklaunchicon}; Components: TeraTerm
 Name: startupttmenuicon; Description: {cm:task_startupttmenuicon}; Components: TeraTerm_Menu
-;Name: startupcollectoricon; Description: {cm:task_startupcollectoricon}; Components: Collector
+Name: startupcollectoricon; Description: {cm:task_startupcollectoricon}; Components: Collector
 Name: cygtermhere; Description: {cm:task_cygtermhere}; Components: cygterm; Flags: unchecked
 Name: quickcyglaunch; Description: {cm:task_quickcyglaunch}; Components: cygterm; Flags: unchecked
 Name: macroassoc; Description: {cm:task_macroassoc}; Components: TeraTerm; Flags: unchecked
@@ -248,18 +248,18 @@
 
 [Run]
 Filename: {app}\ttermpro.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_teraterm}; Components: TeraTerm
-;Filename: {tmp}\Setup_LogMeTT_2_12_1.exe; Flags: skipifsilent runasoriginaluser; Components: LogMeTT
-;Filename: {tmp}\Setup_LogMeTT_2_12_1.exe; Parameters: /SILENT; Flags: skipifnotsilent runasoriginaluser; Components: LogMeTT
-;Filename: {tmp}\Setup_TTLEditor_1_5_1.exe; Flags: skipifsilent runasoriginaluser; Components: TTLEdit
-;Filename: {tmp}\Setup_TTLEditor_1_5_1.exe; Parameters: /SILENT; Flags: skipifnotsilent runasoriginaluser; Components: TTLEdit
+Filename: {tmp}\Setup_LogMeTT_2_12_1.exe; Flags: skipifsilent runasoriginaluser; Components: LogMeTT
+Filename: {tmp}\Setup_LogMeTT_2_12_1.exe; Parameters: /SILENT; Flags: skipifnotsilent runasoriginaluser; Components: LogMeTT
+Filename: {tmp}\Setup_TTLEditor_1_5_1.exe; Flags: skipifsilent runasoriginaluser; Components: TTLEdit
+Filename: {tmp}\Setup_TTLEditor_1_5_1.exe; Parameters: /SILENT; Flags: skipifnotsilent runasoriginaluser; Components: TTLEdit
 Filename: {app}\ttpmenu.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_ttmenu}; Components: TeraTerm_Menu
-;Filename: {app}\Collector\Collector.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_collector}; Components: Collector
+Filename: {app}\Collector\Collector.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_collector}; Components: Collector
 
 [CustomMessages]
 en.task_desktopicon=Create Tera Term shortcut to &Desktop
 en.task_quicklaunchicon=Create Tera Term shortcut to &Quick Launch
 en.task_startupttmenuicon=Create TeraTerm &Menu shortcut to Startup
-;en.task_startupcollectoricon=Create &Collector shortcut to Startup
+en.task_startupcollectoricon=Create &Collector shortcut to Startup
 en.task_cygtermhere=Add "Cy&gterm Here" to Context menu
 en.task_quickcyglaunch=Create cyg&launch shortcut to Quick Launch
 en.task_macroassoc=Associate .&ttl file to ttpmacro.exe
@@ -269,7 +269,7 @@
 ja.task_desktopicon=\x83f\x83X\x83N\x83g\x83b\x83v\x82\xC9 Tera Term \x82̃V\x83\x87\x81[\x83g\x83J\x83b\x83g\x82\xF0\x8D\xEC\x82\xE9(&D)
 ja.task_quicklaunchicon=\x83N\x83C\x83b\x83N\x8BN\x93\xAE\x82\xC9 Tera Term \x82̃V\x83\x87\x81[\x83g\x83J\x83b\x83g\x82\xF0\x8D\xEC\x82\xE9(&Q)
 ja.task_startupttmenuicon=\x83X\x83^\x81[\x83g\x83A\x83b\x83v\x82\xC9 TeraTerm &Menu \x82̃V\x83\x87\x81[\x83g\x83J\x83b\x83g\x82\xF0\x8D\xEC\x82\xE9
-;ja.task_startupcollectoricon=\x83X\x83^\x81[\x83g\x83A\x83b\x83v\x82\xC9 &Collector \x82̃V\x83\x87\x81[\x83g\x83J\x83b\x83g\x82\xF0\x8D\xEC\x82\xE9
+ja.task_startupcollectoricon=\x83X\x83^\x81[\x83g\x83A\x83b\x83v\x82\xC9 &Collector \x82̃V\x83\x87\x81[\x83g\x83J\x83b\x83g\x82\xF0\x8D\xEC\x82\xE9
 ja.task_cygtermhere=\x83R\x83\x93\x83e\x83L\x83X\x83g\x83\x81\x83j\x83\x85\x81[\x82\xC9 "Cy&gterm Here" \x82\xF0\x92lj\xC1\x82\xB7\x82\xE9
 ja.task_quickcyglaunch=\x83N\x83C\x83b\x83N\x8BN\x93\xAE\x82\xC9 cyg&launch \x82̃V\x83\x87\x81[\x83g\x83J\x83b\x83g\x82\xF0\x8D\xEC\x82\xE9
 ja.task_macroassoc=.&ttl \x83t\x83@\x83C\x83\x8B\x82\xF0 ttpmacro.exe \x82Ɋ֘A\x95t\x82\xAF\x82\xE9
@@ -286,10 +286,10 @@
 ja.type_custom=\x83J\x83X\x83^\x83\x80\x83C\x83\x93\x83X\x83g\x81[\x83\x8B
 en.launch_teraterm=Launch &Tera Term
 en.launch_ttmenu=Launch TeraTerm &Menu
-;en.launch_collector=Launch &Collector
+en.launch_collector=Launch &Collector
 ja.launch_teraterm=\x8D\xA1\x82\xB7\x82\xAE &Tera Term \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9
 ja.launch_ttmenu=\x8D\xA1\x82\xB7\x82\xAE TeraTerm &Menu \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9
-;ja.launch_collector=\x8D\xA1\x82\xB7\x82\xAE &Collector \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9
+ja.launch_collector=\x8D\xA1\x82\xB7\x82\xAE &Collector \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9
 en.msg_language_caption=Select Language
 en.msg_language_description=Which language shoud be used?
 en.msg_language_subcaption=Select the language of application's menu and dialog, then click Next.
@@ -953,7 +953,7 @@
 Name: {group}\TeraTerm Document(Japanese).lnk; Type: files
 Name: {group}\TTSSH Document.lnk; Type: files
 Name: {group}\TTSSH Document(Japanese).lnk; Type: files
-;Name: {app}\LogMeTT.hlp; Type: files
+Name: {app}\LogMeTT.hlp; Type: files
 Name: {app}\macro.hlp; Type: files
 Name: {app}\macroj.hlp; Type: files
 Name: {app}\ttermp.hlp; Type: files


Ttssh2-commit メーリングリストの案内