From 43df697b6b8af6ea3d928c0d112ba1c428fb8faf Mon Sep 17 00:00:00 2001 From: Vincent Gao Date: Tue, 25 May 2021 06:51:39 +0800 Subject: [ctp] New version v6.6.1_P1_20210406_se (#17969) Co-authored-by: Vincent Gao --- ports/ctp/CONTROL | 4 +- ports/ctp/portfile.cmake | 101 ++++++++++++++++++++++++++++++----------------- versions/baseline.json | 4 +- versions/c-/ctp.json | 5 +++ 4 files changed, 73 insertions(+), 41 deletions(-) diff --git a/ports/ctp/CONTROL b/ports/ctp/CONTROL index e47dbd8e2..f8e114137 100644 --- a/ports/ctp/CONTROL +++ b/ports/ctp/CONTROL @@ -1,6 +1,6 @@ Source: ctp -Version: 6.3.15_20190220_se -Port-Version: 1 +Version: 6.6.1_P1_20210406_se +Port-Version: 0 Homepage: http://www.sfit.com.cn/index.htm Description: The Comprehensive Transaction Platform (CTP) is a future brokerage management system developed specially for futures companies. CTP API client library allows users to connect to CTP gateway for algorithmic trading. diff --git a/ports/ctp/portfile.cmake b/ports/ctp/portfile.cmake index 4b7ae6654..65c61802c 100644 --- a/ports/ctp/portfile.cmake +++ b/ports/ctp/portfile.cmake @@ -3,66 +3,93 @@ message(STATUS "Note: the downloading server may only be avilable from 8:00AM-5: vcpkg_fail_port_install(ON_TARGET "OSX" "UWP" ON_ARCH "arm") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -vcpkg_download_distfile(ARCHIVE - URLS "http://www.sfit.com.cn/DocumentDown/api_3/5_2_2/6.3.15_20190220.zip" - FILENAME "6.3.15_20190220.zip" - SHA512 e17bb9d7fdda85f944b241d7ecd6a3b6f7e145f1a9d39ad48b36aa015e7e8a1b599e0289c8c38ce0a84cc8426a374fd620b07815dc9b6083c562389867138577 +vcpkg_download_distfile(TRADEAPI_ARCHIVE + URLS "http://www.sfit.com.cn/DocumentDown/api_3/5_2_2/v6.6.1_P1_tradeapi.zip" + FILENAME "v6.6.1_P1_tradeapi.zip" + SHA512 04d8ba233394fea04dacfa4bcb8758d9e068025ab3d963f6a89dcdfb79bbe10d58c10a71f630a039e130e4f8dfdc05cb4d1a52fd23d908f0798e43792d656cc4 ) +if("datacollect" IN_LIST FEATURES) + # Data collect library is not included in this version, and official release note said we should get it from traderapi_v6.3.19_P1 + vcpkg_download_distfile(DATACOLLECT_ARCHIVE + URLS "http://www.sfit.com.cn/DocumentDown/api_3/5_2_2/traderapi_v6.3.19_P1.zip" + FILENAME "traderapi_v6.3.19_P1.zip" + SHA512 ce44d761b2aebaaf131b91bcfc2fa0d5466c023310bcae1f03297fe228f62d2c281c09a82bb4068ae92ddd3d5ba00359b7b44b8c44af1181fff1954317d24bbb + ) +endif() + vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH UNPACK_PATH - ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH TRADEAPI_UNPACK_PATH + ARCHIVE ${TRADEAPI_ARCHIVE} NO_REMOVE_ONE_LEVEL ) -if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(ARCH_ARCHIVE "6.3.15_20190220_tradeapi_se_windows.zip") - set(ARCH_ARCHIVE_DATACOLLECT "6.3.15_20190220_clientdll_windows.zip") +if("datacollect" IN_LIST FEATURES) + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH DATACOLLECT_UNPACK_PATH + ARCHIVE ${DATACOLLECT_ARCHIVE} + NO_REMOVE_ONE_LEVEL + ) +endif() + + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(TRADEAPI_SOURCE_PATH "${TRADEAPI_UNPACK_PATH}/v6.6.1_P1_20210406_winApi/tradeapi/20210406_tradeapi_se_windows") elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(ARCH_ARCHIVE "6.3.15_20190220_tradeapi64_se_windows.zip") - set(ARCH_ARCHIVE_DATACOLLECT "6.3.15_20190220_clientdll64_windows.zip") + set(TRADEAPI_SOURCE_PATH "${TRADEAPI_UNPACK_PATH}/v6.6.1_P1_20210406_winApi/tradeapi/20210406_tradeapi64_se_windows") elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(ARCH_ARCHIVE "v6.3.15_20190220_api_tradeapi_se_linux64.tar") - set(ARCH_ARCHIVE_DATACOLLECT "v6.3.15_20190220_api_clientdatacollectdll_linux64.tar") + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH TRADEAPI_LINUX_TAR_PATH + ARCHIVE "${TRADEAPI_UNPACK_PATH}/v6.6.1_P1_20210406_api_tradeapi_linux64.tar" + ) + set(TRADEAPI_SOURCE_PATH "${TRADEAPI_LINUX_TAR_PATH}/v6.6.1_P1_20210406_api_tradeapi_se_linux64") else() message(FATAL_ERROR "${TARGET_TRIPLET} is not a supported platform" ) endif() -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE "${UNPACK_PATH}/${ARCH_ARCHIVE}" -) +if("datacollect" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(DATACOLLECT_SOURCE_PATH "${DATACOLLECT_UNPACK_PATH}/v6.3.19_P1_20200106_winApi/20200106_clientdll_windows") + elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(DATACOLLECT_SOURCE_PATH "${DATACOLLECT_UNPACK_PATH}/v6.3.19_P1_20200106_winApi/20200106_clientdll64_windows") + elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH DATACOLLECT_LINUX_TAR_PATH + ARCHIVE "${DATACOLLECT_UNPACK_PATH}/v6.3.19_P1_20200106_api.tar" + ) + set(DATACOLLECT_SOURCE_PATH "${DATACOLLECT_LINUX_TAR_PATH}/v6.3.19_P1_20200106_api_clientdatacollectdll_linux64") + else() + message(FATAL_ERROR "${TARGET_TRIPLET} is not a supported platform" ) + endif() +endif() + -file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") +file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") if(VCPKG_TARGET_IS_WINDOWS) - file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") - file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") - file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") - file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") + file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") + file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") + file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") + file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") elseif(VCPKG_TARGET_IS_LINUX) - file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.so") - file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.so") + file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.so") + file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.so") endif() -file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/share FILES_MATCHING PATTERN "*.xml") -file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/share FILES_MATCHING PATTERN "*.dtd") +file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} FILES_MATCHING PATTERN "*.xml") +file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} FILES_MATCHING PATTERN "*.dtd") if("datacollect" IN_LIST FEATURES) - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH_DATACOLLECT - ARCHIVE "${UNPACK_PATH}/${ARCH_ARCHIVE_DATACOLLECT}" - ) - file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") if(VCPKG_TARGET_IS_WINDOWS) - file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") - file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") - file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") - file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") elseif(VCPKG_TARGET_IS_LINUX) - file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.so") - file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.so") + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.so") + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.so") endif() endif() diff --git a/versions/baseline.json b/versions/baseline.json index 98347c2e6..8eb7696b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1521,8 +1521,8 @@ "port-version": 0 }, "ctp": { - "baseline": "6.3.15_20190220_se", - "port-version": 1 + "baseline": "6.6.1_P1_20210406_se", + "port-version": 0 }, "ctre": { "baseline": "2.10", diff --git a/versions/c-/ctp.json b/versions/c-/ctp.json index fb66ad203..ad91bff78 100644 --- a/versions/c-/ctp.json +++ b/versions/c-/ctp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "253cd7c440e8e50fc940c7d2812a6d39b371dbf2", + "version-string": "6.6.1_P1_20210406_se", + "port-version": 0 + }, { "git-tree": "8536b8c9fe4d95bb93ebd961e1e1dadc9dd6e4e9", "version-string": "6.3.15_20190220_se", -- cgit v1.2.3