svnno****@sourc*****
svnno****@sourc*****
2017年 7月 5日 (水) 00:01:34 JST
Tera TermRevision: 6833
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6833
Author: doda
Date: 2017-07-05 00:01:34 +0900 (Wed, 05 Jul 2017)
Log Message:
-----------
バージョン情報をヘッダファイルに移し、そこで管理するよう変更 [Ttssh2-devel 3316]
ttxssh-version.rc をリソースエディタで編集すると値を展開されてしまうため、通常はテキストエディタ等で変更すること。
Modified Paths:
--------------
trunk/ttssh2/ttxssh/ttxssh.rc
trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj
trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj.filters
trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj
trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj.filters
trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj
trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj.filters
trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj
trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj.filters
trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj
trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters
trunk/ttssh2/ttxssh/ttxssh.v9.vcproj
trunk/ttssh2/ttxssh/ttxssh.vcproj
Added Paths:
-----------
trunk/ttssh2/ttxssh/ttxssh-version.h
trunk/ttssh2/ttxssh/ttxssh-version.rc
-------------- next part --------------
Added: trunk/ttssh2/ttxssh/ttxssh-version.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh-version.h (rev 0)
+++ trunk/ttssh2/ttxssh/ttxssh-version.h 2017-07-04 15:01:34 UTC (rev 6833)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#define TTSSH_VERSION_MAJOR 2
+#define TTSSH_VERSION_MINOR 81
+#define TTSSH_TOSTR(x) TTSSH_TOSTR2(x)
+#define TTSSH_TOSTR2(x) #x
+#define TTSSH_VERSION_STR(sep) TTSSH_TOSTR(TTSSH_VERSION_MAJOR) sep TTSSH_TOSTR(TTSSH_VERSION_MINOR)
+#define TTSSH_RES_VERSION_STR TTSSH_VERSION_STR(", ") ", 0, 0"
Added: trunk/ttssh2/ttxssh/ttxssh-version.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh-version.rc (rev 0)
+++ trunk/ttssh2/ttxssh/ttxssh-version.rc 2017-07-04 15:01:34 UTC (rev 6833)
@@ -0,0 +1,38 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+#include "ttxssh-version.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION TTSSH_VERSION_MAJOR,TTSSH_VERSION_MINOR,0,0
+ PRODUCTVERSION TTSSH_VERSION_MAJOR,TTSSH_VERSION_MINOR,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "FileDescription", "TTXSSH"
+ VALUE "FileVersion", TTSSH_RES_VERSION_STR
+ VALUE "InternalName", "TTXSSH"
+ VALUE "LegalCopyright", "(C)1998-2001 Robert O'Callahan, (C) 2000-2003 Jun-ya KATO, (C) 2004-2017 TeraTerm Project"
+ VALUE "OriginalFilename", "TTXSSH.dll"
+ VALUE "ProductName", "TTSSH"
+ VALUE "ProductVersion", TTSSH_RES_VERSION_STR
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
Property changes on: trunk/ttssh2/ttxssh/ttxssh-version.rc
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.rc 2017-07-04 15:01:34 UTC (rev 6833)
@@ -34,7 +34,7 @@
LTEXT "Tera Term Secure Shell extension, ",IDC_TTSSH_VERSION,6,7,220,15
ICON "",IDC_TTSSH_ICON,248,7,20,20
LTEXT "Compatible with SSH protocol version 1.5 and 2.0",IDC_SSHVERSIONS,6,23,206,11
- LTEXT "Includes:\r\nTTSSH 1.5.4, (C) 1998-2001 Robert O'Callahan roc+t****@cs*****\r\nIPv6 extention version 0.81, (C) 2000-2003 Jun-ya KATO kato****@win6*****\r\nSSH2 support, (C) 2004-2016 TeraTerm Project",IDC_INCLUDES,6,36,262,34
+ LTEXT "Includes:\r\nTTSSH 1.5.4, (C) 1998-2001 Robert O'Callahan roc+t****@cs*****\r\nIPv6 extention version 0.81, (C) 2000-2003 Jun-ya KATO kato****@win6*****\r\nSSH2 support, (C) 2004-2017 TeraTerm Project",IDC_INCLUDES,6,36,262,34
LTEXT "OpenSSL:",IDC_OPENSSL_VERSION,6,69,175,8
LTEXT "zlib:",IDC_ZLIB_VERSION,6,78,175,8
LTEXT "PuTTY:",IDC_PUTTY_VERSION,6,87,175,8
@@ -599,7 +599,7 @@
3 TEXTINCLUDE
BEGIN
- "\r\n"
+ "#include ""ttxssh-version.rc""\r\n"
"\0"
END
@@ -616,44 +616,6 @@
IDI_SECURETT ICON "ttsecure.ico"
IDI_SECURETT_GREEN ICON "ttsecure_green.ico"
IDI_SECURETT_YELLOW ICON "ttsecure_yellow.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,81,0,0
- PRODUCTVERSION 2,81,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "FileDescription", "TTXSSH"
- VALUE "FileVersion", "2, 81, 0, 0"
- VALUE "InternalName", "TTXSSH"
- VALUE "LegalCopyright", "(C)1998-2001 Robert O'Callahan, (C) 2000-2003 Jun-ya KATO, (C) 2004-2017 TeraTerm Project"
- VALUE "OriginalFilename", "TTXSSH.dll"
- VALUE "ProductName", "TTSSH"
- VALUE "ProductVersion", "2, 81, 0, 0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
#endif // \x89p\x8C\xEA (\x95č\x91) resources
/////////////////////////////////////////////////////////////////////////////
@@ -664,8 +626,8 @@
//
// Generated from the TEXTINCLUDE 3 resource.
//
+#include "ttxssh-version.rc"
-
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
Modified: trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj 2017-07-04 15:01:34 UTC (rev 6833)
@@ -194,6 +194,7 @@
<ClInclude Include="resource.h" />
<ClInclude Include="sftp.h" />
<ClInclude Include="ssh.h" />
+ <ClInclude Include="ttxssh-version.h" />
<ClInclude Include="ttxssh.h" />
<ClInclude Include="util.h" />
<ClInclude Include="x11util.h" />
@@ -203,6 +204,7 @@
<None Include="ttsecure_yellow.ico" />
</ItemGroup>
<ItemGroup>
+ <ResourceCompile Include="ttxssh-version.rc" />
<ResourceCompile Include="ttxssh.rc" />
</ItemGroup>
<ItemGroup>
@@ -221,4 +223,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj.filters
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj.filters 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj.filters 2017-07-04 15:01:34 UTC (rev 6833)
@@ -102,6 +102,9 @@
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="ttxssh-version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ttxssh.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -194,8 +197,11 @@
</Filter>
</ItemGroup>
<ItemGroup>
+ <ResourceCompile Include="ttxssh-version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
<ResourceCompile Include="ttxssh.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj 2017-07-04 15:01:34 UTC (rev 6833)
@@ -199,6 +199,7 @@
<ClInclude Include="resource.h" />
<ClInclude Include="sftp.h" />
<ClInclude Include="ssh.h" />
+ <ClInclude Include="ttxssh-version.h" />
<ClInclude Include="ttxssh.h" />
<ClInclude Include="util.h" />
<ClInclude Include="x11util.h" />
@@ -208,6 +209,7 @@
<Image Include="ttsecure_yellow.ico" />
</ItemGroup>
<ItemGroup>
+ <ResourceCompile Include="ttxssh-version.rc" />
<ResourceCompile Include="ttxssh.rc" />
</ItemGroup>
<ItemGroup>
@@ -226,4 +228,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj.filters
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj.filters 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj.filters 2017-07-04 15:01:34 UTC (rev 6833)
@@ -102,6 +102,9 @@
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="ttxssh-version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ttxssh.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -194,8 +197,11 @@
</Filter>
</ItemGroup>
<ItemGroup>
+ <ResourceCompile Include="ttxssh-version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
<ResourceCompile Include="ttxssh.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj 2017-07-04 15:01:34 UTC (rev 6833)
@@ -199,6 +199,7 @@
<ClInclude Include="resource.h" />
<ClInclude Include="sftp.h" />
<ClInclude Include="ssh.h" />
+ <ClInclude Include="ttxssh-version.h" />
<ClInclude Include="ttxssh.h" />
<ClInclude Include="util.h" />
<ClInclude Include="x11util.h" />
@@ -208,6 +209,7 @@
<Image Include="ttsecure_yellow.ico" />
</ItemGroup>
<ItemGroup>
+ <ResourceCompile Include="ttxssh-version.rc" />
<ResourceCompile Include="ttxssh.rc" />
</ItemGroup>
<ItemGroup>
Modified: trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj.filters
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj.filters 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj.filters 2017-07-04 15:01:34 UTC (rev 6833)
@@ -102,6 +102,9 @@
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="ttxssh-version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ttxssh.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -194,6 +197,9 @@
</Filter>
</ItemGroup>
<ItemGroup>
+ <ResourceCompile Include="ttxssh-version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
<ResourceCompile Include="ttxssh.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
@@ -203,4 +209,4 @@
<Filter>Def File</Filter>
</None>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj 2017-07-04 15:01:34 UTC (rev 6833)
@@ -199,6 +199,7 @@
<ClInclude Include="resource.h" />
<ClInclude Include="sftp.h" />
<ClInclude Include="ssh.h" />
+ <ClInclude Include="ttxssh-version.h" />
<ClInclude Include="ttxssh.h" />
<ClInclude Include="util.h" />
<ClInclude Include="x11util.h" />
@@ -208,6 +209,7 @@
<Image Include="ttsecure_yellow.ico" />
</ItemGroup>
<ItemGroup>
+ <ResourceCompile Include="ttxssh-version.rc" />
<ResourceCompile Include="ttxssh.rc" />
</ItemGroup>
<ItemGroup>
Modified: trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj.filters
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj.filters 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj.filters 2017-07-04 15:01:34 UTC (rev 6833)
@@ -102,6 +102,9 @@
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="ttxssh-version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ttxssh.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -194,6 +197,9 @@
</Filter>
</ItemGroup>
<ItemGroup>
+ <ResourceCompile Include="ttxssh-version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
<ResourceCompile Include="ttxssh.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
@@ -203,4 +209,4 @@
<Filter>Def File</Filter>
</None>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj 2017-07-04 15:01:34 UTC (rev 6833)
@@ -199,6 +199,7 @@
<ClInclude Include="resource.h" />
<ClInclude Include="sftp.h" />
<ClInclude Include="ssh.h" />
+ <ClInclude Include="ttxssh-version.h" />
<ClInclude Include="ttxssh.h" />
<ClInclude Include="util.h" />
<ClInclude Include="x11util.h" />
@@ -208,6 +209,7 @@
<Image Include="ttsecure_yellow.ico" />
</ItemGroup>
<ItemGroup>
+ <ResourceCompile Include="ttxssh-version.rc" />
<ResourceCompile Include="ttxssh.rc" />
</ItemGroup>
<ItemGroup>
@@ -226,4 +228,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters 2017-07-04 15:01:34 UTC (rev 6833)
@@ -102,6 +102,9 @@
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="ttxssh-version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ttxssh.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -194,6 +197,9 @@
</Filter>
</ItemGroup>
<ItemGroup>
+ <ResourceCompile Include="ttxssh-version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
<ResourceCompile Include="ttxssh.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
@@ -203,4 +209,4 @@
<Filter>Def File</Filter>
</None>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/ttxssh/ttxssh.v9.vcproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v9.vcproj 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.v9.vcproj 2017-07-04 15:01:34 UTC (rev 6833)
@@ -311,6 +311,10 @@
>
</File>
<File
+ RelativePath="ttxssh-version.h"
+ >
+ </File>
+ <File
RelativePath="util.h"
>
</File>
@@ -452,6 +456,10 @@
>
</File>
<File
+ RelativePath="ttxssh-version.rc"
+ >
+ </File>
+ <File
RelativePath="ttxssh.rc"
>
</File>
Modified: trunk/ttssh2/ttxssh/ttxssh.vcproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.vcproj 2017-07-04 15:01:30 UTC (rev 6832)
+++ trunk/ttssh2/ttxssh/ttxssh.vcproj 2017-07-04 15:01:34 UTC (rev 6833)
@@ -308,6 +308,10 @@
>
</File>
<File
+ RelativePath="ttxssh-version.h"
+ >
+ </File>
+ <File
RelativePath="ttxssh.h"
>
</File>
@@ -457,6 +461,10 @@
>
</File>
<File
+ RelativePath="ttxssh-version.rc"
+ >
+ </File>
+ <File
RelativePath="ttxssh.rc"
>
</File>