Tera TermRevision: 11010
https://osdn.net/projects/ttssh2/scm/svn/commits/11010
Author: zmatsuo
Date: 2023-10-16 23:53:54 +0900 (Mon, 16 Oct 2023)
Log Message:
-----------
リソースのバージョン番号に "dev" などの文字列を入れるよう修正
- ttermpro.exe 等のプロパティ、詳細タブ、製品バージョン
- 変更前は製品バージョンはファイルバージョンと同じ内容だった
- "5.1 dev r11010" など
- ttxssh の ttxssh-version.h の include を最小限にした
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/11010
Modified Paths:
--------------
trunk/teraterm/common/tt-version.h
trunk/teraterm/teraterm/tt-version.rc
trunk/teraterm/ttpcmn/ttpcmn-version.rc
trunk/teraterm/ttpmacro/ttm-version.rc
trunk/teraterm/ttptek/ttptek-version.rc
trunk/ttssh2/ttxssh/ssh.c
trunk/ttssh2/ttxssh/ttxssh.c
trunk/ttssh2/ttxssh/ttxssh.h
-------------- next part --------------
Modified: trunk/teraterm/common/tt-version.h
===================================================================
--- trunk/teraterm/common/tt-version.h 2023-10-16 14:53:44 UTC (rev 11009)
+++ trunk/teraterm/common/tt-version.h 2023-10-16 14:53:54 UTC (rev 11010)
@@ -35,9 +35,29 @@
// SUBSTR \x82\xAA\x95s\x97v\x82Ȏ\x9E\x82\xCD undef \x82\xB7\x82\xE9
// \x8Eg\x97p\x97\xE1 "dev", "RC", "RC2"
-#define TT_TOSTR(x) TT_TOSTR2(x)
-#define TT_TOSTR2(x) #x
-#define TT_VERSION_STR(sep) TT_TOSTR(TT_VERSION_MAJOR) sep TT_TOSTR(TT_VERSION_MINOR)
-#define TT_RES_VERSION_STR TT_VERSION_STR(", ") ", 0, 0"
+#define TT_TOSTR(x) TT_TOSTR_HELPER(x)
+#define TT_TOSTR_HELPER(x) #x
+#define TT_VERSION_STR(sep) TT_TOSTR(TT_VERSION_MAJOR) sep TT_TOSTR(TT_VERSION_MINOR)
#include "svnversion.h"
+
+// TT_RES_PRODUCT_VERSION_STR
+// \x83\x8A\x83\\x81[\x83X\x83t\x83@\x83C\x83\x8B(rc\x83t\x83@\x83C\x83\x8B) ProductVersion \x97p
+#if !defined(TT_VERSION_SUBSTR)
+ // ex "5.1"
+#define TT_RES_PRODUCT_VERSION_STR TT_TOSTR(TT_VERSION_MAJOR) "." TT_TOSTR(TT_VERSION_MINOR)
+#elif !defined(SVNVERSION)
+ // ex "5.1 dev"
+#define TT_RES_PRODUCT_VERSION_STR \
+ TT_TOSTR(TT_VERSION_MAJOR) "." TT_TOSTR(TT_VERSION_MINOR) " " TT_VERSION_SUBSTR
+#else
+ // ex "5.1 dev r9999"
+#define TT_RES_PRODUCT_VERSION_STR \
+ TT_TOSTR(TT_VERSION_MAJOR) "." TT_TOSTR(TT_VERSION_MINOR) " " TT_VERSION_SUBSTR " r" TT_TOSTR(SVNVERSION)
+#endif
+
+// TT_RES_VERSION_STR
+// \x83\x8A\x83\\x81[\x83X\x83t\x83@\x83C\x83\x8B(rc\x83t\x83@\x83C\x83\x8B) FileVersion \x97p
+// ex "5, 1, 0, 0"
+#undef TT_RES_VERSION_STR
+#define TT_RES_VERSION_STR TT_TOSTR(TT_VERSION_MAJOR) ", " TT_TOSTR(TT_VERSION_MINOR) ", 0, 0"
Modified: trunk/teraterm/teraterm/tt-version.rc
===================================================================
--- trunk/teraterm/teraterm/tt-version.rc 2023-10-16 14:53:44 UTC (rev 11009)
+++ trunk/teraterm/teraterm/tt-version.rc 2023-10-16 14:53:54 UTC (rev 11010)
@@ -23,13 +23,13 @@
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "T. Teranishi, TeraTerm Project"
- VALUE "FileDescription", "Tera Term"
+ VALUE "FileDescription", "Tera Term is open source free software terminal emulator"
VALUE "FileVersion", TT_RES_VERSION_STR
VALUE "InternalName", "TTERMPRO"
VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2023 TeraTerm Project"
VALUE "OriginalFilename", "TTERMPRO.EXE"
VALUE "ProductName", "Tera Term"
- VALUE "ProductVersion", TT_RES_VERSION_STR
+ VALUE "ProductVersion", TT_RES_PRODUCT_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/teraterm/ttpcmn/ttpcmn-version.rc
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn-version.rc 2023-10-16 14:53:44 UTC (rev 11009)
+++ trunk/teraterm/ttpcmn/ttpcmn-version.rc 2023-10-16 14:53:54 UTC (rev 11010)
@@ -33,7 +33,7 @@
VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2023 TeraTerm Project"
VALUE "OriginalFilename", "ttpcmn.dll"
VALUE "ProductName", "Tera Term"
- VALUE "ProductVersion", TT_RES_VERSION_STR
+ VALUE "ProductVersion", TT_RES_PRODUCT_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/teraterm/ttpmacro/ttm-version.rc
===================================================================
--- trunk/teraterm/ttpmacro/ttm-version.rc 2023-10-16 14:53:44 UTC (rev 11009)
+++ trunk/teraterm/ttpmacro/ttm-version.rc 2023-10-16 14:53:54 UTC (rev 11010)
@@ -29,7 +29,7 @@
VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2023 TeraTerm Project"
VALUE "OriginalFilename", "TTPMACRO.EXE"
VALUE "ProductName", "Tera Term"
- VALUE "ProductVersion", TT_RES_VERSION_STR
+ VALUE "ProductVersion", TT_RES_PRODUCT_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/teraterm/ttptek/ttptek-version.rc
===================================================================
--- trunk/teraterm/ttptek/ttptek-version.rc 2023-10-16 14:53:44 UTC (rev 11009)
+++ trunk/teraterm/ttptek/ttptek-version.rc 2023-10-16 14:53:54 UTC (rev 11010)
@@ -33,7 +33,7 @@
VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2023 TeraTerm Project"
VALUE "OriginalFilename", "ttptek.dll"
VALUE "ProductName", "Tera Term"
- VALUE "ProductVersion", TT_RES_VERSION_STR
+ VALUE "ProductVersion", TT_RES_PRODUCT_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2023-10-16 14:53:44 UTC (rev 11009)
+++ trunk/ttssh2/ttxssh/ssh.c 2023-10-16 14:53:54 UTC (rev 11010)
@@ -34,6 +34,7 @@
#include "key.h"
#include "ttcommon.h"
#include "codeconv.h"
+#include "ttxssh-version.h"
#include <openssl/bn.h>
#include <openssl/evp.h>
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2023-10-16 14:53:44 UTC (rev 11009)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2023-10-16 14:53:54 UTC (rev 11010)
@@ -34,6 +34,7 @@
*/
#include "ttxssh.h"
+#include "ttxssh-version.h"
#include "fwdui.h"
#include "util.h"
#include "ssh.h"
Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h 2023-10-16 14:53:44 UTC (rev 11009)
+++ trunk/ttssh2/ttxssh/ttxssh.h 2023-10-16 14:53:54 UTC (rev 11010)
@@ -68,7 +68,6 @@
typedef struct _TInstVar *PTInstVar;
-#include "ttxssh-version.h"
#include "util.h"
#include "pkt.h"
#include "ssh.h"