• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision9644 (tree)
Time2021-12-28 01:12:34
Authorzmatsuo

Log Message

cmakeビルドできるよう修正

- puttyversion.h を使用しなくなったので関連コードを削除

- putty-0.76.tar.gz の url を修正
- version.c 追加

Change Summary

Incremental Difference

--- branches/putty_0_76/ttssh2/putty/CMakeLists.txt (revision 9643)
+++ branches/putty_0_76/ttssh2/putty/CMakeLists.txt (revision 9644)
@@ -16,6 +16,7 @@
1616 ../../libs/putty/sshsh256.c
1717 ../../libs/putty/tree234.c
1818 ../../libs/putty/utils.c
19+ ../../libs/putty/version.c
1920 ../../libs/putty/windows/wincapi.c
2021 ../../libs/putty/windows/winhandl.c
2122 ../../libs/putty/windows/winhsock.c
--- branches/putty_0_76/ttssh2/ttxssh/CMakeLists.txt (revision 9643)
+++ branches/putty_0_76/ttssh2/ttxssh/CMakeLists.txt (revision 9644)
@@ -12,7 +12,6 @@
1212 target_sources(
1313 ${PACKAGE_NAME}
1414 PRIVATE
15- ${CMAKE_CURRENT_BINARY_DIR}/puttyversion.h
1615 ../matcher/matcher.c
1716 arc4random.c
1817 arc4random.h
@@ -211,38 +210,8 @@
211210 crypt32.lib # TODO このlibを使用しないパッチを適応したら削除すること
212211 )
213212
214-### create puttyversion.h
215-
216-set(PUTTY_ISS "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss")
217-if(NOT EXISTS ${PUTTY_ISS})
218- message(FATAL_ERROR "${PUTTY_ISS} not found")
219-endif()
220-
221-file(READ "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss" iis)
222-
223-string(REGEX MATCH "VersionInfoTextVersion=([^\n]+)\n" _ ${iis})
224-set(version_str ${CMAKE_MATCH_1})
225-if("${version_str}" STREQUAL "")
226- string(REGEX MATCH "AppVerName=([^\n]+)\n" _ ${iis})
227- set(version_str ${CMAKE_MATCH_1})
228-endif()
229-if("${version_str}" STREQUAL "")
230- set(version_str "unknown")
231-endif()
232-message("putty version=\"${version_str}\"")
233-FILE(
234- WRITE ${CMAKE_CURRENT_BINARY_DIR}/puttyversion.h
235- "#define PUTTYVERSION \"${version_str}\"\n"
236- )
237-
238213 install(
239214 TARGETS ttxssh
240215 RUNTIME
241216 DESTINATION .
242217 )
243-
244-####
245-# ソースツリー内に生成ファイルが存在していたら削除する
246-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
247- file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
248-endif()
Show on old repository browser