Tera TermRevision: 10598
https://osdn.net/projects/ttssh2/scm/svn/commits/10598
Author: zmatsuo
Date: 2023-02-18 00:54:06 +0900 (Sat, 18 Feb 2023)
Log Message:
-----------
about dialog のバージョン情報に TT_VERSION_SUBSTR が反映するようにした
- TT_VERSION_SUBSTR を "beta1-dev" とした (tt-version.h)
- devは開発中を示す
- svnrev.pl で TT_VERSION_SUBSTR の コメントアウトに対応
- バージョン表示領域を少し広くした
Modified Paths:
--------------
trunk/buildtools/svnrev/svnrev.pl
trunk/teraterm/common/tt-version.h
trunk/teraterm/ttpdlg/ttdlg.c
trunk/teraterm/ttpdlg/ttpdlg.rc
-------------- next part --------------
Modified: trunk/buildtools/svnrev/svnrev.pl
===================================================================
--- trunk/buildtools/svnrev/svnrev.pl 2023-02-16 23:05:45 UTC (rev 10597)
+++ trunk/buildtools/svnrev/svnrev.pl 2023-02-17 15:54:06 UTC (rev 10598)
@@ -196,13 +196,13 @@
open(my $FH, '<', $tt_version_h) or die "error open $tt_version_h";
while (<$FH>) {
- if (/#define\s+TT_VERSION_MAJOR\s+(\d+)/) {
+ if (/^\s*#define\s+TT_VERSION_MAJOR\s+(\d+)/) {
$tt_version_major = $1;
}
- elsif (/#define\s+TT_VERSION_MINOR\s+(\d+)/) {
+ elsif (/^\s*#define\s+TT_VERSION_MINOR\s+(\d+)/) {
$tt_version_minor = $1;
}
- elsif (/#define\s+TT_VERSION_SUBSTR\s+\"(.+)\"/) {
+ elsif (/^\s*#define\s+TT_VERSION_SUBSTR\s+\"(.+)\"/) {
$tt_version_substr = $1;
}
}
Modified: trunk/teraterm/common/tt-version.h
===================================================================
--- trunk/teraterm/common/tt-version.h 2023-02-16 23:05:45 UTC (rev 10597)
+++ trunk/teraterm/common/tt-version.h 2023-02-17 15:54:06 UTC (rev 10598)
@@ -30,7 +30,9 @@
#define TT_VERSION_MAJOR 5
#define TT_VERSION_MINOR 0
-#define TT_VERSION_SUBSTR "beta1"
+#define TT_VERSION_SUBSTR "beta1-dev"
+// SUBSTR \x82\xAA\x95s\x97v\x82Ȏ\x9E\x82̓R\x83\x81\x83\x93\x83g\x83A\x83E\x83g\x82\xB7\x82\xE9
+// \x8Eg\x97p\x97\xE1 "dev", "rc"
#define TT_TOSTR(x) TT_TOSTR2(x)
#define TT_TOSTR2(x) #x
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2023-02-16 23:05:45 UTC (rev 10597)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2023-02-17 15:54:06 UTC (rev 10598)
@@ -2379,6 +2379,11 @@
// Tera Term \x96{\x91̂̃o\x81[\x83W\x83\x87\x83\x93
_snprintf_s(buf, sizeof(buf), _TRUNCATE, "Version %d.%d", TT_VERSION_MAJOR, TT_VERSION_MINOR);
+#if defined(TT_VERSION_SUBSTR)
+ if (sizeof(TT_VERSION_SUBSTR) > 1) {
+ strncat_s(buf, sizeof(buf), " " TT_VERSION_SUBSTR, _TRUNCATE);
+ }
+#endif
#if defined(_M_X64)
strncat_s(buf, sizeof(buf), " 64bit", _TRUNCATE);
#endif
Modified: trunk/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.rc 2023-02-16 23:05:45 UTC (rev 10597)
+++ trunk/teraterm/ttpdlg/ttpdlg.rc 2023-02-17 15:54:06 UTC (rev 10598)
@@ -221,7 +221,7 @@
BEGIN
ICON "",IDC_TT_ICON,6,9,20,20
CONTROL "Tera Term",IDC_TT_PRO,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,4,113,8
- LTEXT "Version",IDC_TT_VERSION,38,13,113,8
+ LTEXT "Version",IDC_TT_VERSION,38,13,130,8
CONTROL "(C) 2004-2022 TeraTerm Project",IDC_PROJECT_LABEL,
"Static",SS_LEFTNOWORDWRAP | WS_GROUP,43,22,148,8
LTEXT "Includes:",IDC_INLUCDE_LABEL,38,38,153,8