Tera Term

[ttssh2-commit] [10361] ライブラリごとに関数化, zlib 1.2.13 にアップデート

• 前の記事 (スレッド) [ttssh2-commit] [10360] タブをスペースに変換
• 次の記事 (スレッド) [ttssh2-commit] [10362] ライブラリのダウンロードを download.cmake にまとめた
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 10361
          https://osdn.net/projects/ttssh2/scm/svn/commits/10361
Author:   zmatsuo
Date:     2022-11-12 23:44:30 +0900 (Sat, 12 Nov 2022)
Log Message:
-----------
ライブラリごとに関数化, zlib 1.2.13 にアップデート

- zlib 1.2.12 -> 1.2.13
- TERA TERM がビルドエラーとなるのでコメントにいれた
  - putty 0.76 -> 0.78
  - libressl 3.4.3 -> 3.5.3, 3.6.1

Modified Paths:
--------------
    trunk/libs/download.cmake

-------------- next part --------------
Modified: trunk/libs/download.cmake
===================================================================
--- trunk/libs/download.cmake	2022-11-12 14:44:20 UTC (rev 10360)
+++ trunk/libs/download.cmake	2022-11-12 14:44:30 UTC (rev 10361)
@@ -113,160 +113,220 @@
 
 
 # argon2
-message("argon2")
-set(EXT_DIR "${CMAKE_CURRENT_LIST_DIR}")
-set(DIR_IN_ARC "phc-winner-argon2-20190702")
-set(RENAME_DIR "argon2")
-set(CHECK_FILE "argon2/CHANGELOG.md")
-set(CHECK_HASH "1b513eb6524f0a3ac5e182bf2713618ddd8f2616ebe6e090d647c49b3e7eb2ec")
-set(SRC_URL "https://github.com/P-H-C/phc-winner-argon2/archive/refs/tags/20190702.tar.gz")
-set(ARC_HASH "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c")
-#   ARC_HASH by TeraTerm Project
-set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/argon2")
-download_extract(
-  ${SRC_URL}
-  ${ARC_HASH}
-  ${DOWN_DIR}
-  ${EXT_DIR}
-  ${DIR_IN_ARC}
-  ${RENAME_DIR}
-  ${CHECK_FILE}
-  ${CHECK_HASH}
+function(download_argon2)
+  message("argon2")
+  set(EXT_DIR "${CMAKE_CURRENT_LIST_DIR}")
+  set(DIR_IN_ARC "phc-winner-argon2-20190702")
+  set(RENAME_DIR "argon2")
+  set(CHECK_FILE "argon2/CHANGELOG.md")
+  set(CHECK_HASH "1b513eb6524f0a3ac5e182bf2713618ddd8f2616ebe6e090d647c49b3e7eb2ec")
+  set(SRC_URL "https://github.com/P-H-C/phc-winner-argon2/archive/refs/tags/20190702.tar.gz")
+  set(ARC_HASH "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c")
+  #   ARC_HASH by TeraTerm Project
+  set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/argon2")
+  download_extract(
+    ${SRC_URL}
+    ${ARC_HASH}
+    ${DOWN_DIR}
+    ${EXT_DIR}
+    ${DIR_IN_ARC}
+    ${RENAME_DIR}
+    ${CHECK_FILE}
+    ${CHECK_HASH}
   )
+endfunction()
 
 # cJSON
-message("cJSON")
-set(EXT_DIR "${CMAKE_CURRENT_LIST_DIR}")
-set(DIR_IN_ARC "cJSON-1.7.14")
-set(RENAME_DIR "cJSON")
-set(CHECK_FILE "cJSON/CHANGELOG.md")
-set(CHECK_HASH "4ff95e0060ea2dbc13720079399e77d404d89e514b569fcc8d741f3272c98e53")
-set(SRC_URL "https://github.com/DaveGamble/cJSON/archive/v1.7.14.zip")
-set(ARC_HASH "d797b4440c91a19fa9c721d1f8bab21078624aa9555fc64c5c82e24aa2a08221")
-#   ARC_HASH by TeraTerm Project
-set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/cJSON")
-download_extract(
-  ${SRC_URL}
-  ${ARC_HASH}
-  ${DOWN_DIR}
-  ${EXT_DIR}
-  ${DIR_IN_ARC}
-  ${RENAME_DIR}
-  ${CHECK_FILE}
-  ${CHECK_HASH}
+function(download_cjson)
+  message("cJSON")
+  set(EXT_DIR "${CMAKE_CURRENT_LIST_DIR}")
+  set(DIR_IN_ARC "cJSON-1.7.14")
+  set(RENAME_DIR "cJSON")
+  set(CHECK_FILE "cJSON/CHANGELOG.md")
+  set(CHECK_HASH "4ff95e0060ea2dbc13720079399e77d404d89e514b569fcc8d741f3272c98e53")
+  set(SRC_URL "https://github.com/DaveGamble/cJSON/archive/v1.7.14.zip")
+  set(ARC_HASH "d797b4440c91a19fa9c721d1f8bab21078624aa9555fc64c5c82e24aa2a08221")
+  #   ARC_HASH by TeraTerm Project
+  set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/cJSON")
+  download_extract(
+    ${SRC_URL}
+    ${ARC_HASH}
+    ${DOWN_DIR}
+    ${EXT_DIR}
+    ${DIR_IN_ARC}
+    ${RENAME_DIR}
+    ${CHECK_FILE}
+    ${CHECK_HASH}
   )
+endfunction()
 
 # libressl
-message("libressl")
-set(EXT_DIR "${CMAKE_CURRENT_LIST_DIR}")
-set(DIR_IN_ARC "libressl-3.4.3")
-set(RENAME_DIR "libressl")
-set(CHECK_FILE "libressl/ChangeLog")
-set(CHECK_HASH "96b2032157a92af8ae02ac57cdc9b96a96a3e91b89602936cf6403c9bf7e88ca")
-set(SRC_URL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.4.3.tar.gz")
-set(ARC_HASH "ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d")
-#   ARC_HASH was picked from https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256
-set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/libressl")
-download_extract(
-  ${SRC_URL}
-  ${ARC_HASH}
-  ${DOWN_DIR}
-  ${EXT_DIR}
-  ${DIR_IN_ARC}
-  ${RENAME_DIR}
-  ${CHECK_FILE}
-  ${CHECK_HASH}
+function(download_libressl)
+  message("libressl")
+  set(DIR_IN_ARC "libressl-3.4.3")
+  #set(DIR_IN_ARC "libressl-3.5.3")
+  #set(DIR_IN_ARC "libressl-3.6.1")
+  set(RENAME_DIR "libressl")
+  set(CHECK_FILE "libressl/ChangeLog")
+  set(CHECK_HASH "96b2032157a92af8ae02ac57cdc9b96a96a3e91b89602936cf6403c9bf7e88ca")
+  #set(CHECK_HASH "9cda81ee8f24bca21ee2ed4960abbba29c94efa3c9b7e1b7250321a4b3c3dd21")
+  #set(CHECK_HASH "d5c8debd28a8f52cf4a3eefdddb24f74ff1503976ae99d45c27084ec3e1afabf")
+  set(SRC_URL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.4.3.tar.gz")
+  #set(SRC_URL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.3.tar.gz")
+  #set(SRC_URL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.6.1.tar.gz")
+  set(ARC_HASH "ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d")
+  #set(ARC_HASH "3ab5e5eaef69ce20c6b170ee64d785b42235f48f2e62b095fca5d7b6672b8b28")
+  #set(ARC_HASH "acfac61316e93b919c28d62d53037ca734de85c46b4d703f19fd8395cf006774")
+  #   ARC_HASH was picked from https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256
+  set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/libressl")
+  download_extract(
+    ${SRC_URL}
+    ${ARC_HASH}
+    ${DOWN_DIR}
+    ${EXT_DIR}
+    ${DIR_IN_ARC}
+    ${RENAME_DIR}
+    ${CHECK_FILE}
+    ${CHECK_HASH}
   )
+endfunction()
 
 # oniguruma
-message("oniguruma")
-set(EXT_DIR "${CMAKE_CURRENT_LIST_DIR}")
-set(DIR_IN_ARC "onig-6.9.8")
-set(RENAME_DIR "oniguruma")
-set(CHECK_FILE "oniguruma/HISTORY")
-set(CHECK_HASH "9291f7a1beaa0410265663dc8c18d442b7b3c4fd62a6d6f58df7cacdc4be3c92")
-set(SRC_URL "https://github.com/kkos/oniguruma/releases/download/v6.9.8/onig-6.9.8.tar.gz")
-set(ARC_HASH "https://github.com/kkos/oniguruma/releases/download/v6.9.8/onig-6.9.8.tar.gz.sha256")
-set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/oniguruma")
-download_extract(
-  ${SRC_URL}
-  ${ARC_HASH}
-  ${DOWN_DIR}
-  ${EXT_DIR}
-  ${DIR_IN_ARC}
-  ${RENAME_DIR}
-  ${CHECK_FILE}
-  ${CHECK_HASH}
+function(download_oniguruma)
+  message("oniguruma")
+  set(DIR_IN_ARC "onig-6.9.8")
+  set(RENAME_DIR "oniguruma")
+  set(CHECK_FILE "oniguruma/HISTORY")
+  set(CHECK_HASH "9291f7a1beaa0410265663dc8c18d442b7b3c4fd62a6d6f58df7cacdc4be3c92")
+  set(SRC_URL "https://github.com/kkos/oniguruma/releases/download/v6.9.8/onig-6.9.8.tar.gz")
+  set(ARC_HASH "https://github.com/kkos/oniguruma/releases/download/v6.9.8/onig-6.9.8.tar.gz.sha256")
+  set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/oniguruma")
+  download_extract(
+    ${SRC_URL}
+    ${ARC_HASH}
+    ${DOWN_DIR}
+    ${EXT_DIR}
+    ${DIR_IN_ARC}
+    ${RENAME_DIR}
+    ${CHECK_FILE}
+    ${CHECK_HASH}
   )
+endfunction()
 
 # putty
-message("putty")
-set(EXT_DIR "${CMAKE_CURRENT_LIST_DIR}")
-set(DIR_IN_ARC "putty-0.76")
-set(RENAME_DIR "putty")
-set(CHECK_FILE "putty/version.h")
-set(CHECK_HASH "c6975607ae6fb8510d56fae403fdd83bbafa3efe32397e5956375db49d0fadda")
-set(SRC_URL "https://the.earth.li/~sgtatham/putty/0.76/putty-0.76.tar.gz")
-set(ARC_HASH "547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f")
-#   ARC_HASH was picked from https://the.earth.li/~sgtatham/putty/0.76/sha256sums
-set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/putty")
-download_extract(
-  ${SRC_URL}
-  ${ARC_HASH}
-  ${DOWN_DIR}
-  ${EXT_DIR}
-  ${DIR_IN_ARC}
-  ${RENAME_DIR}
-  ${CHECK_FILE}
-  ${CHECK_HASH}
+function(download_putty)
+  message("putty")
+  set(EXT_DIR "${CMAKE_CURRENT_LIST_DIR}")
+  set(DIR_IN_ARC "putty-0.76")
+  #set(DIR_IN_ARC "putty-0.78")
+  set(RENAME_DIR "putty")
+  set(CHECK_FILE "putty/version.h")
+  set(CHECK_HASH "c6975607ae6fb8510d56fae403fdd83bbafa3efe32397e5956375db49d0fadda")
+  #set(CHECK_HASH "6909c326781299a12368a32b11d62f5fbbe75e3e8ef881a3dec81adff2694320")
+  set(SRC_URL "https://the.earth.li/~sgtatham/putty/0.76/putty-0.76.tar.gz")
+  #set(SRC_URL "https://the.earth.li/~sgtatham/putty/0.78/putty-0.78.tar.gz")
+  set(ARC_HASH "547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f")
+  #   ARC_HASH was picked from https://the.earth.li/~sgtatham/putty/0.76/sha256sums
+  #set(ARC_HASH "274e01bcac6bd155dfd647b2f18f791b4b17ff313753aa919fcae2e32d34614f")
+  #   ARC_HASH was picked from https://the.earth.li/~sgtatham/putty/0.78/sha256sums
+  set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/putty")
+  download_extract(
+    ${SRC_URL}
+    ${ARC_HASH}
+    ${DOWN_DIR}
+    ${EXT_DIR}
+    ${DIR_IN_ARC}
+    ${RENAME_DIR}
+    ${CHECK_FILE}
+    ${CHECK_HASH}
   )
+endfunction()
 
 # SFMT
-message("SFMT")
-set(EXT_DIR "${CMAKE_CURRENT_LIST_DIR}")
-set(DIR_IN_ARC "SFMT-src-1.5.1")
-set(RENAME_DIR "SFMT")
-set(CHECK_FILE "SFMT/CHANGE-LOG.txt")
-set(CHECK_HASH "ac65302c740579c7dccc99b2fcd735af3027957680f2ce227042755646abb1db")
-set(SRC_URL "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/SFMT-src-1.5.1.zip")
-set(ARC_HASH "630d1dfa6b690c30472f75fa97ca90ba62f9c13c5add6c264fdac2c1d3a878f4")
-#   ARC_HASH by TeraTerm Project
-set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/SFMT")
-download_extract(
-  ${SRC_URL}
-  ${ARC_HASH}
-  ${DOWN_DIR}
-  ${EXT_DIR}
-  ${DIR_IN_ARC}
-  ${RENAME_DIR}
-  ${CHECK_FILE}
-  ${CHECK_HASH}
+function(download_sfmt)
+  message("SFMT")
+  set(DIR_IN_ARC "SFMT-src-1.5.1")
+  set(RENAME_DIR "SFMT")
+  set(CHECK_FILE "SFMT/CHANGE-LOG.txt")
+  set(CHECK_HASH "ac65302c740579c7dccc99b2fcd735af3027957680f2ce227042755646abb1db")
+  set(SRC_URL "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/SFMT-src-1.5.1.zip")
+  set(ARC_HASH "630d1dfa6b690c30472f75fa97ca90ba62f9c13c5add6c264fdac2c1d3a878f4")
+  #   ARC_HASH by TeraTerm Project
+  set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/SFMT")
+  download_extract(
+    ${SRC_URL}
+    ${ARC_HASH}
+    ${DOWN_DIR}
+    ${EXT_DIR}
+    ${DIR_IN_ARC}
+    ${RENAME_DIR}
+    ${CHECK_FILE}
+    ${CHECK_HASH}
   )
-set(SFMT_VERSION_H "${EXT_DIR}/${RENAME_DIR}/SFMT_version_for_teraterm.h")
-if(NOT EXISTS ${SFMT_VERSION_H})
-  file(WRITE ${SFMT_VERSION_H}
-    "#define SFMT_VERSION \"1.5.1\"\n"
+  set(SFMT_VERSION_H "${EXT_DIR}/${RENAME_DIR}/SFMT_version_for_teraterm.h")
+  if(NOT EXISTS ${SFMT_VERSION_H})
+    file(WRITE ${SFMT_VERSION_H}
+      "// created by download.cmake\n"
+      "#pragma once\n"
+      "#ifndef SFMT_VERSION_H\n"
+      "#define SFMT_VERSION_H\n"
+      "#define SFMT_VERSION \"1.5.1\"\n"
+      "#endif\n"
     )
-endif()
+  endif()
+endfunction()
 
 # zlib
-message("zlib")
-set(EXT_DIR "${CMAKE_CURRENT_LIST_DIR}")
-set(DIR_IN_ARC "zlib-1.2.12")
-set(RENAME_DIR "zlib")
-set(CHECK_FILE "zlib/ChangeLog")
-set(CHECK_HASH "66a955bd457c93d490c13b82f283b5507972fe50bcd8d9d6dd821ab57f187c2d")
-set(SRC_URL "https://zlib.net/zlib-1.2.12.tar.xz")
-set(ARC_HASH "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18")
-#   ARC_HASH was picked from https://www.zlib.net
-set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/zlib")
-download_extract(
-  ${SRC_URL}
-  ${ARC_HASH}
-  ${DOWN_DIR}
-  ${EXT_DIR}
-  ${DIR_IN_ARC}
-  ${RENAME_DIR}
-  ${CHECK_FILE}
-  ${CHECK_HASH}
+function(download_zlib)
+  message("zlib")
+  set(DIR_IN_ARC "zlib-1.2.13")
+  set(RENAME_DIR "zlib")
+  set(CHECK_FILE "zlib/ChangeLog")
+  set(CHECK_HASH "6933f4ab74360476bc80d9eda2afd98f93588a5d276e1197926267421dd6959e")
+  set(SRC_URL "https://zlib.net/zlib-1.2.13.tar.xz")
+  set(ARC_HASH "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98")
+  #   ARC_HASH was picked from https://www.zlib.net
+  set(DOWN_DIR "${CMAKE_CURRENT_LIST_DIR}/download/zlib")
+  download_extract(
+    ${SRC_URL}
+    ${ARC_HASH}
+    ${DOWN_DIR}
+    ${EXT_DIR}
+    ${DIR_IN_ARC}
+    ${RENAME_DIR}
+    ${CHECK_FILE}
+    ${CHECK_HASH}
   )
+endfunction()
+
+##########
+if(NOT DEFINED TARGET)
+  set(TARGET "all")
+endif()
+if(NOT DEFINED EXT_DIR)
+  set(EXT_DIR "${CMAKE_CURRENT_LIST_DIR}")
+endif()
+#message("TARGET=${TARGET}")
+#message("EXT_DIR=${EXT_DIR}")
+
+if ((${TARGET} STREQUAL "all") OR (${TARGET} STREQUAL "cjson"))
+  download_cjson()
+endif()
+if ((${TARGET} STREQUAL "all") OR (${TARGET} STREQUAL "argon2"))
+  download_argon2()
+endif()
+if ((${TARGET} STREQUAL "all") OR (${TARGET} STREQUAL "libressl"))
+  download_libressl()
+endif()
+if ((${TARGET} STREQUAL "all") OR (${TARGET} STREQUAL "oniguruma"))
+  download_oniguruma()
+endif()
+if ((${TARGET} STREQUAL "all") OR (${TARGET} STREQUAL "putty"))
+  download_putty()
+endif()
+if ((${TARGET} STREQUAL "all") OR (${TARGET} STREQUAL "sfmt"))
+  download_sfmt()
+endif()
+if ((${TARGET} STREQUAL "all") OR (${TARGET} STREQUAL "zlib"))
+  download_zlib()
+endif()

• 前の記事 (スレッド) [ttssh2-commit] [10360] タブをスペースに変換
• 次の記事 (スレッド) [ttssh2-commit] [10362] ライブラリのダウンロードを download.cmake にまとめた
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]