Tera TermRevision: 9644
https://osdn.net/projects/ttssh2/scm/svn/commits/9644
Author: zmatsuo
Date: 2021-12-28 01:12:34 +0900 (Tue, 28 Dec 2021)
Log Message:
-----------
cmakeビルドできるよう修正
- puttyversion.h を使用しなくなったので関連コードを削除
- r6624, r6625
- putty-0.76.tar.gz の url を修正
- version.c 追加
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/6624
https://osdn.net/projects/ttssh2/scm/svn/commits/6625
Modified Paths:
--------------
branches/putty_0_76/libs/putty.cmake
branches/putty_0_76/ttssh2/putty/CMakeLists.txt
branches/putty_0_76/ttssh2/ttxssh/CMakeLists.txt
-------------- next part --------------
Modified: branches/putty_0_76/libs/putty.cmake
===================================================================
--- branches/putty_0_76/libs/putty.cmake 2021-12-27 15:36:12 UTC (rev 9643)
+++ branches/putty_0_76/libs/putty.cmake 2021-12-27 16:12:34 UTC (rev 9644)
@@ -2,7 +2,7 @@
set(SRC_DIR_BASE "putty-0.76")
set(SRC_ARC "putty-0.76.tar.gz")
-set(SRC_URL "https://the.earth.li/~sgtatham/putty/latest/putty-0.76.tar.gz")
+set(SRC_URL "https://the.earth.li/~sgtatham/putty/0.76/putty-0.76.tar.gz")
set(SRC_ARC_HASH_SHA256 547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f)
set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/putty")
Modified: branches/putty_0_76/ttssh2/putty/CMakeLists.txt
===================================================================
--- branches/putty_0_76/ttssh2/putty/CMakeLists.txt 2021-12-27 15:36:12 UTC (rev 9643)
+++ branches/putty_0_76/ttssh2/putty/CMakeLists.txt 2021-12-27 16:12:34 UTC (rev 9644)
@@ -16,6 +16,7 @@
../../libs/putty/sshsh256.c
../../libs/putty/tree234.c
../../libs/putty/utils.c
+ ../../libs/putty/version.c
../../libs/putty/windows/wincapi.c
../../libs/putty/windows/winhandl.c
../../libs/putty/windows/winhsock.c
Modified: branches/putty_0_76/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- branches/putty_0_76/ttssh2/ttxssh/CMakeLists.txt 2021-12-27 15:36:12 UTC (rev 9643)
+++ branches/putty_0_76/ttssh2/ttxssh/CMakeLists.txt 2021-12-27 16:12:34 UTC (rev 9644)
@@ -12,7 +12,6 @@
target_sources(
${PACKAGE_NAME}
PRIVATE
- ${CMAKE_CURRENT_BINARY_DIR}/puttyversion.h
../matcher/matcher.c
arc4random.c
arc4random.h
@@ -211,38 +210,8 @@
crypt32.lib # TODO このlibを使用しないパッチを適応したら削除すること
)
-### create puttyversion.h
-
-set(PUTTY_ISS "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss")
-if(NOT EXISTS ${PUTTY_ISS})
- message(FATAL_ERROR "${PUTTY_ISS} not found")
-endif()
-
-file(READ "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss" iis)
-
-string(REGEX MATCH "VersionInfoTextVersion=([^\n]+)\n" _ ${iis})
-set(version_str ${CMAKE_MATCH_1})
-if("${version_str}" STREQUAL "")
- string(REGEX MATCH "AppVerName=([^\n]+)\n" _ ${iis})
- set(version_str ${CMAKE_MATCH_1})
-endif()
-if("${version_str}" STREQUAL "")
- set(version_str "unknown")
-endif()
-message("putty version=\"${version_str}\"")
-FILE(
- WRITE ${CMAKE_CURRENT_BINARY_DIR}/puttyversion.h
- "#define PUTTYVERSION \"${version_str}\"\n"
- )
-
install(
TARGETS ttxssh
RUNTIME
DESTINATION .
)
-
-####
-# ソースツリー内に生成ファイルが存在していたら削除する
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
- file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
-endif()