Revision: 10926 https://osdn.net/projects/ttssh2/scm/svn/commits/10926 Author: zmatsuo Date: 2023-09-11 22:57:47 +0900 (Mon, 11 Sep 2023) Log Message: ----------- develop.html の更新 - release.bat を使ってビルドする方法を追記 Modified Paths: -------------- trunk/doc/en/html/reference/develop.html trunk/doc/ja/html/reference/develop.html -------------- next part -------------- Modified: trunk/doc/en/html/reference/develop.html =================================================================== --- trunk/doc/en/html/reference/develop.html 2023-09-10 11:45:33 UTC (rev 10925) +++ trunk/doc/en/html/reference/develop.html 2023-09-11 13:57:47 UTC (rev 10926) @@ -856,7 +856,10 @@ <li>Increment the version while RC release process. <p>The binary is released for test in this timing. Prevent that old and new binary have same version number.</p> <ul> - <li>teraterm\common\tt-version.h</li> + <li> + teraterm\common\tt-version.h<br> + set TT_VERSION_SUBSTR to "rc". + </li> <li>ttssh2\ttxssh\ttxssh-version.h</li> <li>Onttpmenu\ttpmenu.rc // only modifying</li> <li>TTProxy\TTProxy.rc // only modifying</li> @@ -892,19 +895,36 @@ </ul> </li> <li>Create installer. + <dl> + <dt>use installer\release.bat</dt> + <dd> + Run installer\release.bat to create installer and zip.<br> + <ul> + <li> + Edit teraterm/common/tt-version.h + <pre> +- #define TT_VERSION_SUBSTR "dev" ++ #define TT_VERSION_SUBSTR "rc" +</pre> + Versions will use values in teraterm/common/tt-version.h. + </li> + <li> + Run installer\release.bat.<br> + Create installer in installer\iscc.bat called installer\release.bat. + </li> + <li>Output install and zip in installer\Output folder.</li> + </ul> + </dd> + <dt>use Inno Script Studio</dt> + <dd> + It is easier to use installer\release.bat when create an RC,release.<br> + Debugging installer is easy to use Inno Script Studio. <ul> <li>Version up AppVer and add "RC" in teraterm.iss. <pre> -- #define AppVer "4.105" -+ #define AppVer "4.106-RC1" - </pre> +- #define AppVer "5.0-dev" ++ #define AppVer "5.0-rc"</pre> </li> - <li>Comment out snapshot in teraterm.iss. - <pre> -- #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); -+ ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); - </pre> - </li> <li>Change calling batch file to enable rebuild and create archive. <pre> [PreCompile] @@ -923,6 +943,8 @@ <li>Open teraterm\installer\teraterm.iss with Inno Script Studio, and create installer by "Project"-"Compile."</li> <li>Compress portable version with zip.</li> </ul> + </dd> + </dl> </li> <li>Test run installer, run and connect in all supported OS.</li> <li>Add to OSDN Release @@ -952,15 +974,34 @@ </ul> </li> <li>Create installer. + <dl> + <dt>Use installer\release.bat</dt> + <dd> + Run installer\release.bat to create installer and zip.<br> <ul> + <li> + Change teraterm/common/tt-version.h. + <pre> +- #define TT_VERSION_SUBSTR "rc" ++ //#define TT_VERSION_SUBSTR "rc" +</pre> + </li> + <li>run installer\release.bat.</li> + <li>Installer and zip are output to installer\Output folder.</li> + </ul> + </dd> + <dt>Use Inno Script Studio</dt> + <dd> + <ul> <li>Change AppVer in teraterm.iss. <pre> -- #define AppVer "4.106-RC1" -+ #define AppVer "4.106" - </pre> +- #define AppVer "5.0-rc" ++ #define AppVer "5.0"</pre> </li> <li>Open teraterm\installer\teraterm.iss with ISTool, and create installer by "Project"-"Compile Setup."</li> </ul> + </dd> + </dl> </li> <li>Commit this state.</li> <li>Create SVN tag.<br /> @@ -975,10 +1016,22 @@ <p>All source code is same as development branch. Only SVN revision is different.</p> </li> <li>Create installer. + <dl> + <dt>Use installer\release.bat</dt> + <dd> + <ul> + <li>run installer\release.bat.</li> + <li>Installer and zip are output to installer\Output folder.</li> + </ul> + </dd> + <dt>Use Inno Script Studio</dt> + <dd> <ul> <li>Open teraterm\installer\teraterm.iss with Inno Script Studio, and create installer by "Project"-"Compile."</li> <li>Compress portable version with zip.</li> </ul> + </dd> + </dl> </li> <li>Update OSDN project site. <ul> @@ -1004,10 +1057,27 @@ </ul> </li> <li id="revert_teraterm_iss">Revert teraterm.iss in development branch. + <dl> + <dt>Use installer\release.bat</dt> + <dd> + Edit teraterm/common/tt-version.h.<br> + Increment TT_VERSION_MINOR and set SUBSTR to "dev". + <pre> +- //#define TT_VERSION_SUBSTR "rc" ++ #define TT_VERSION_SUBSTR "dev" +</pre> + </dd> + <dt>Use Inno Script Studio</dt> + <dd> + <ul> + <li>Set AppVer to [next version]-dev in teraterm.iss + <pre> +- #define AppVer "5.0" ++ #define AppVer "5.1-dev"</pre> + </li> + <li> +Revert teraterm.iss in developbranch and commit. <pre> -- ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); -+ #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); - [PreCompile] Name: makechm.bat - ;Name: build.bat @@ -1020,6 +1090,9 @@ + ;Name: makearchive.bat; Parameters: release </pre> </li> + </ul> + </dd> + </dl> <li>Update Chocolatey.</li> </ol> Modified: trunk/doc/ja/html/reference/develop.html =================================================================== --- trunk/doc/ja/html/reference/develop.html 2023-09-10 11:45:33 UTC (rev 10925) +++ trunk/doc/ja/html/reference/develop.html 2023-09-11 13:57:47 UTC (rev 10926) @@ -849,7 +849,10 @@ <li>\x83o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x88\xEA\x82C\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9 <p>\x88\xEA\x94ʂɃe\x83X\x83g\x82\xF0\x8CĂт\xA9\x82\xAF\x81A\x8B\x8C\x83o\x81[\x83W\x83\x87\x83\x93\x82Ƃ̓\xAF\x8E\x9E\x8E\xC0\x8Ds\x82\xAA\x8Dl\x82\xA6\x82\xE7\x82\xEA\x82邽\x82߁A\x82\xB1\x82̃^\x83C\x83~\x83\x93\x83O\x82Ƃ\xB7\x82\xE9\x81B</p> <ul> - <li>teraterm\common\tt-version.h</li> + <li> + teraterm\common\tt-version.h<br> + TT_VERSION_SUBSTR \x82\xF0 "rc" \x82ɂ\xB7\x82\xE9 + </li> <li>ttssh2\ttxssh\ttxssh-version.h</li> <li>Onttpmenu\ttpmenu.rc // \x95ύX\x8E\x9E\x82̂\xDD</li> <li>TTProxy\TTProxy.rc // \x95ύX\x8E\x9E\x82̂\xDD</li> @@ -884,20 +887,37 @@ <li>doc\ja\html\macro\index.html</li> </ul> </li> - <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9 + <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9<br> + <dl> + <dt>installer\release.bat\x82\xF0\x8Eg\x97p</dt> + <dd> + installer\release.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x82āA\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x81[\x81Azip\x82\xF0\x8D쐬\x82\xB5\x82܂\xB7\x81B<br> + <ul> + <li> + teraterm/common/tt-version.h \x82\xF0\x95ҏW\x82\xB7\x82\xE9 + <pre> +- #define TT_VERSION_SUBSTR "dev" ++ #define TT_VERSION_SUBSTR "rc" +</pre> + \x83o\x81[\x83W\x83\x87\x83\x93\x82Ȃǂ\xCD teraterm/common/tt-version.h \x82̒l\x82\xAA\x8Eg\x97p\x82\xB3\x82\xEA\x82܂\xB7\x81B + </li> + <li> + installer\release.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x82܂\xB7\x81B<br> + \x83C\x83\x93\x83X\x83g\x81[\x83\x89\x81[\x82\xCD installer\release.bat \x82\xA9\x82\xE7\x8CĂяo\x82\xB3\x82\xEA\x82\xE9 installer\iscc.bat \x82ō쐬\x82\xB3\x82\xEA\x82܂\xB7\x81B + </li> + <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x81[\x81Azip\x82\xAAinstaller\Output \x83t\x83H\x83\x8B\x83_\x82ɏo\x97͂\xB3\x82\xEA\x82܂\xB7\x81B</li> + </ul> + </dd> + <dt>Inno Script Studio \x82\xF0\x8Eg\x82\xA4\x8Fꍇ</dt> + <dd> + RC,\x83\x8A\x83\x8A\x81[\x83X\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x8Fꍇ\x82́Ainstaller\release.bat\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x82ق\xA4\x82\xAA\x95֗\x98\x82ł\xB7\x82\xAA\x81A<br> + \x83C\x83\x93\x83X\x83g\x81[\x83\x89\x81[\x82̃f\x83o\x83O\x82Ȃ\xC7Inno Script Studio\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x82ƕ֗\x98\x82ł\xB7\x81B <ul> <li>teraterm.iss \x82\xCC AppVer \x82\xF0\x81u\x8E\x9F\x82̃o\x81[\x83W\x83\x87\x83\x93-RC\x81v\x82Ƃ\xB7\x82\xE9 <pre> -- #define AppVer "4.105" -+ #define AppVer "4.106-RC1" - </pre> +- #define AppVer "5.0-dev" ++ #define AppVer "5.0-rc"</pre> </li> - <li>teraterm.iss \x82\xCC snapshot \x82\xF0\x83R\x83\x81\x83\x93\x83g\x83A\x83E\x83g\x82\xB7\x82\xE9 - <pre> -- #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); -+ ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); - </pre> - </li> <li>teraterm.iss \x82\xA9\x82\xE7\x8BN\x93\xAE\x82\xB7\x82\xE9\x83o\x83b\x83`\x82\xF0\x81A\x83\x8A\x83\x8A\x81[\x83X\x97p\x82Ɂu\x83\x8A\x83r\x83\x8B\x83h\x97L\x8C\xF8\x81v\x81u\x83A\x81[\x83J\x83C\x83u\x8D쐬\x97L\x8C\xF8\x81v\x82ɂ\xB7\x82\xE9 <pre> [PreCompile] @@ -916,11 +936,13 @@ <li>Inno Script Studio \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A"Project"-"Compile" \x82ŃC\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9</li> <li>\x8D쐬\x82\xB3\x82ꂽ\x83|\x81[\x83^\x83u\x83\x8B\x94ł\xF0 zip \x82ň\xB3\x8Fk\x82\xB7\x82\xE9</li> </ul> + </dd> + </dl> </li> <li>\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x91S OS \x82ŃC\x83\x93\x83X\x83g\x81[\x83\x89\x82̎\xC0\x8Ds\x81A\x8BN\x93\xAE\x81A\x90ڑ\xB1\x82\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9</li> <li>OSDN \x82̃\x8A\x83\x8A\x81[\x83X\x95\xA8\x8C\x8F\x82ɒlj\xC1\x82\xB7\x82\xE9 <ul> - <li>\x81uTera Term RC\x81v\x83p\x83b\x83P\x81[\x83W\x82ɐV\x82\xB5\x82\xA2\x83\x8A\x83\x8A\x81[\x83X\x81i\x97\xE1: "4.106 RC"\x81j\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9</li> + <li>\x81uTera Term RC\x81v\x83p\x83b\x83P\x81[\x83W\x82ɐV\x82\xB5\x82\xA2\x83\x8A\x83\x8A\x81[\x83X\x81i\x97\xE1: "5.0 RC"\x81j\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9</li> <li>\x90V\x82\xB5\x82\xA2\x83\x8A\x83\x8A\x81[\x83X\x82ɁA\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x81E\x83|\x81[\x83^\x83u\x83\x8B\x94ł\xCC zip \x83t\x83@\x83C\x83\x8B\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9</li> </ul> </li> @@ -945,23 +967,42 @@ </ul> </li> <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9 + <dl> + <dt>installer\release.bat\x82\xF0\x8Eg\x97p</dt> + <dd> + installer\release.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x82āA\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x81[\x81Azip\x82\xF0\x8D쐬\x82\xB5\x82܂\xB7\x81B<br> + <ul> + <li> + teraterm/common/tt-version.h \x82\xF0\x95ҏW\x82\xB7\x82\xE9 + <pre> +- #define TT_VERSION_SUBSTR "rc" ++ //#define TT_VERSION_SUBSTR "rc" +</pre> + </li> + <li>installer\release.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x82܂\xB7\x81B</li> + <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x81[\x81Azip\x82\xAAinstaller\Output \x83t\x83H\x83\x8B\x83_\x82ɏo\x97͂\xB3\x82\xEA\x82܂\xB7\x81B</li> + </ul> + </dd> + <dt>Inno Script Studio \x82\xF0\x8Eg\x82\xA4\x8Fꍇ</dt> + <dd> <ul> <li>teraterm.iss \x82\xCC AppVer \x82\xF0\x95ύX\x82\xB7\x82\xE9 <pre> -- #define AppVer "4.106-RC1" -+ #define AppVer "4.106" - </pre> +- #define AppVer "5.0-rc" ++ #define AppVer "5.0"</pre> </li> <li>ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A"Project"-"Compile Setup" \x82ō쐬\x82\xB7\x82\xE9</li> </ul> + </dd> + </dl> </li> <li>\x82\xB1\x82̏\xF3\x91ԂŃR\x83~\x83b\x83g\x82\xB7\x82\xE9</li> <li>SVN \x82̃^\x83O\x82\xF0\x8D쐬\x82\xB7\x82\xE9<br /> - \x83^\x83O\x96\xBC\x82́uteraterm-\x83o\x81[\x83W\x83\x87\x83\x93\x81v\x81B\x81i\x97\xE1: v4.106\x82Ȃ\xE7\x82\xCE"teraterm-4_106"\x81j + \x83^\x83O\x96\xBC\x82́uteraterm-\x83o\x81[\x83W\x83\x87\x83\x93\x81v\x81B\x81i\x97\xE1: v5.0\x82Ȃ\xE7\x82\xCE"teraterm-5_0"\x81j <pre> -svn copy -m "Release 4.106" \ +svn copy -m "Release 5.0" \ svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable \ - svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_106 + svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-5_0 </pre> </li> <li>\x83\x8A\x83\x8A\x81[\x83X\x97p\x82̃^\x83O\x82Ń`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB5\x92\xBC\x82\xB7<br /> @@ -968,10 +1009,22 @@ <p>SVN \x82̃\x8A\x83r\x83W\x83\x87\x83\x93\x88ȊO\x82̂\xB7\x82ׂĂ\xAA\x81A\x8AJ\x94\xAD\x83u\x83\x89\x83\x93\x83`\x82Ɠ\xAF\x82\xB6\x8F\xF3\x91ԂɂȂ\xE9</p> </li> <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9 + <dl> + <dt>installer\release.bat\x82\xF0\x8Eg\x97p</dt> + <dd> + <ul> + <li>installer\release.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x82܂\xB7\x81B</li> + <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x81[\x81Azip\x82\xAAinstaller\Output \x83t\x83H\x83\x8B\x83_\x82ɏo\x97͂\xB3\x82\xEA\x82܂\xB7\x81B</li> + </ul> + </dd> + <dt>Inno Script Studio \x82\xF0\x8Eg\x82\xA4\x8Fꍇ</dt> + <dd> <ul> <li>Inno Script Studio \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A"Project"-"Compile" \x82ō쐬\x82\xB7\x82\xE9</li> <li>\x8D쐬\x82\xB3\x82ꂽ\x83|\x81[\x83^\x83u\x83\x8B\x94ł\xF0 zip \x82ň\xB3\x8Fk\x82\xB7\x82\xE9</li> </ul> + </dd> + </dl> </li> <li>OSDN \x82\xF0\x8DX\x90V\x82\xB7\x82\xE9 <ul> @@ -994,11 +1047,28 @@ </li> </ul> </li> - <li id="revert_teraterm_iss">\x8AJ\x94\xAD\x83u\x83\x89\x83\x93\x83`\x82\xCC teraterm.iss \x82\xF0\x96߂\xB5\x81A\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9 + <li id="revert_teraterm_iss">\x8AJ\x94\xAD\x83u\x83\x89\x83\x93\x83`\x82\xF0\x8C\xB3\x82ɖ߂\xB5\x81A\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9 + <dl> + <dt>installer\release.bat\x82\xF0\x8Eg\x97p</dt> + <dd> + teraterm/common/tt-version.h \x82\xF0\x95ҏW\x82\xB7\x82\xE9\x81B + TT_VERSION_MINOR \x82\xF01\x82i\x82߂āASUBSTR \x82\xF0 "dev" \x82ɂ\xB7\x82\xE9\x81B + <pre> +- //#define TT_VERSION_SUBSTR "rc" ++ #define TT_VERSION_SUBSTR "dev" +</pre> + </dd> + <dt>Inno Script Studio \x82\xF0\x8Eg\x82\xA4\x8Fꍇ</dt> + <dd> + <ul> + <li>teraterm.iss \x82\xCC AppVer \x82\xF0\x81u\x8E\x9F\x82̃o\x81[\x83W\x83\x87\x83\x93-dev\x81v\x82Ƃ\xB7\x82\xE9 + <pre> +- #define AppVer "5.0" ++ #define AppVer "5.1-dev"</pre> + </li> + <li> +\x8AJ\x94\xAD\x83u\x83\x89\x83\x93\x83`\x82\xCC teraterm.iss \x82\xF0\x96߂\xB5\x81A\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9 <pre> -- ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); -+ #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); - [PreCompile] Name: makechm.bat - ;Name: build.bat @@ -1010,7 +1080,10 @@ - Name: makearchive.bat; Parameters: release + ;Name: makearchive.bat; Parameters: release </pre> - </li> + </li> + </ul> + </dd> + </dl> <li>Chocolatey \x82̓o\x98^\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9</li> </ol>