From 4a4d4d7ecae7d54bef4ce3f27f0fa8d4e13cf6e5 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Mon, 20 May 2019 12:08:57 +0800 Subject: [PATCH 01/28] Add: set(VCPKG_PLATFORM_TOOLSET v140) --- triplets/x64-windows-static.cmake | 1 + triplets/x64-windows.cmake | 2 +- triplets/x86-windows-static.cmake | 3 ++- triplets/x86-windows.cmake | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/triplets/x64-windows-static.cmake b/triplets/x64-windows-static.cmake index 75f9b95325ed5b..0dc68ffdd67158 100644 --- a/triplets/x64-windows-static.cmake +++ b/triplets/x64-windows-static.cmake @@ -1,3 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_PLATFORM_TOOLSET v140) diff --git a/triplets/x64-windows.cmake b/triplets/x64-windows.cmake index d0be7297f0c468..90aeb74b0e8e22 100644 --- a/triplets/x64-windows.cmake +++ b/triplets/x64-windows.cmake @@ -1,4 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) - +set(VCPKG_PLATFORM_TOOLSET v140) diff --git a/triplets/x86-windows-static.cmake b/triplets/x86-windows-static.cmake index c855f0caa0d489..4990a6073f3f44 100644 --- a/triplets/x86-windows-static.cmake +++ b/triplets/x86-windows-static.cmake @@ -1,3 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE static) -set(VCPKG_LIBRARY_LINKAGE static) \ No newline at end of file +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_PLATFORM_TOOLSET v140) diff --git a/triplets/x86-windows.cmake b/triplets/x86-windows.cmake index 40ccbe152dc10c..30e1d4546c5123 100644 --- a/triplets/x86-windows.cmake +++ b/triplets/x86-windows.cmake @@ -1,3 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_PLATFORM_TOOLSET v140) \ No newline at end of file From 7a46859fe2578e67d8d075f1dac601b09513465d Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Wed, 22 May 2019 14:18:48 +0800 Subject: [PATCH 02/28] add ppxbase and ppxnet. --- ports/ppxbase/CONTROL | 3 +++ ports/ppxbase/portfile.cmake | 37 ++++++++++++++++++++++++++++++++++++ ports/ppxbase/usage | 5 +++++ ports/ppxnet/CONTROL | 4 ++++ ports/ppxnet/portfile.cmake | 36 +++++++++++++++++++++++++++++++++++ ports/ppxnet/usage | 5 +++++ 6 files changed, 90 insertions(+) create mode 100644 ports/ppxbase/CONTROL create mode 100644 ports/ppxbase/portfile.cmake create mode 100644 ports/ppxbase/usage create mode 100644 ports/ppxnet/CONTROL create mode 100644 ports/ppxnet/portfile.cmake create mode 100644 ports/ppxnet/usage diff --git a/ports/ppxbase/CONTROL b/ports/ppxbase/CONTROL new file mode 100644 index 00000000000000..d7f2d59b1becbe --- /dev/null +++ b/ports/ppxbase/CONTROL @@ -0,0 +1,3 @@ +Source: ppxbase +Version: 1.6 +Description: C++ Common Library. diff --git a/ports/ppxbase/portfile.cmake b/ports/ppxbase/portfile.cmake new file mode 100644 index 00000000000000..3ec3b4c86c2bb0 --- /dev/null +++ b/ports/ppxbase/portfile.cmake @@ -0,0 +1,37 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO winsoft666/ppxbase + REF v1.9 + SHA512 bf8247690759e3b3ccc68f700ca5f25263596379c3a42f30c2fec4d430d671f31bec6e0fda0405815076fbd0b709cb93c07d4781f62f744e1ad560d88e54d6ba + HEAD_REF master +) + + +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(BUILD_SHARED_LIBS OFF) +else() + set(BUILD_SHARED_LIBS ON) +endif() + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} + -DBUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ppxbase RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + + +vcpkg_copy_pdbs() + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + diff --git a/ports/ppxbase/usage b/ports/ppxbase/usage new file mode 100644 index 00000000000000..e0b266570ce38e --- /dev/null +++ b/ports/ppxbase/usage @@ -0,0 +1,5 @@ +The package ppxbase is compatible with built-in CMake targets: + + find_package(ppxbase REQUIRED) + target_link_libraries(main PRIVATE ${PPXBASE_LIBRARIES}) + target_include_directories(main PRIVATE ${PPXBASE_INCLUDE_DIRS}) diff --git a/ports/ppxnet/CONTROL b/ports/ppxnet/CONTROL new file mode 100644 index 00000000000000..ec778199180625 --- /dev/null +++ b/ports/ppxnet/CONTROL @@ -0,0 +1,4 @@ +Source: ppxnet +Version: 1.1 +Description: C++ Network library +Build-Depends: ppxbase diff --git a/ports/ppxnet/portfile.cmake b/ports/ppxnet/portfile.cmake new file mode 100644 index 00000000000000..c2175932194cc8 --- /dev/null +++ b/ports/ppxnet/portfile.cmake @@ -0,0 +1,36 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO winsoft666/ppxnet + REF v1.0 + SHA512 1 + HEAD_REF master +) + + +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(BUILD_SHARED_LIBS OFF) +else() + set(BUILD_SHARED_LIBS ON) +endif() + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} + -DBUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ppxnet RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_copy_pdbs() + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + diff --git a/ports/ppxnet/usage b/ports/ppxnet/usage new file mode 100644 index 00000000000000..41d18f79e041cb --- /dev/null +++ b/ports/ppxnet/usage @@ -0,0 +1,5 @@ +The package ppxnet is compatible with built-in CMake targets: + + find_package(ppxnet REQUIRED) + target_link_libraries(main PRIVATE ${PPXNET_LIBRARIES}) + target_include_directories(main PRIVATE ${PPXNET_INCLUDE_DIRS}) From 32fb86fc1f51b6fc7385ad4bf6c04c4ae3a5b7c1 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Thu, 23 May 2019 16:57:41 +0800 Subject: [PATCH 03/28] nice, ppxbase and ppxnet can install successful. --- ports/ppxbase/CONTROL | 2 +- ports/ppxbase/portfile.cmake | 13 ++++++++++--- ports/ppxbase/usage | 5 +++-- ports/ppxnet/portfile.cmake | 12 ++++++++++-- ports/ppxnet/usage | 5 +++-- 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/ports/ppxbase/CONTROL b/ports/ppxbase/CONTROL index d7f2d59b1becbe..d876a4ab1be6e5 100644 --- a/ports/ppxbase/CONTROL +++ b/ports/ppxbase/CONTROL @@ -1,3 +1,3 @@ Source: ppxbase -Version: 1.6 +Version: 1.15 Description: C++ Common Library. diff --git a/ports/ppxbase/portfile.cmake b/ports/ppxbase/portfile.cmake index 3ec3b4c86c2bb0..b7b59e06818ee7 100644 --- a/ports/ppxbase/portfile.cmake +++ b/ports/ppxbase/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxbase - REF v1.9 - SHA512 bf8247690759e3b3ccc68f700ca5f25263596379c3a42f30c2fec4d430d671f31bec6e0fda0405815076fbd0b709cb93c07d4781f62f744e1ad560d88e54d6ba + REF v1.17 + SHA512 8029c26d53f518b2e5ac6273cea26f19b4cce9bbc72291eb741e01cea973450ef6dfff2ba36d363dd19dfab902360ae0911db5d64c86ab895e2028422ec9eb10 HEAD_REF master ) @@ -22,15 +22,22 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DBUILD_TESTS=OFF + OPTIONS_RELEASE + OPTIONS_DEBUG ) vcpkg_install_cmake() +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/ppxbase) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ppxbase) +elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/ppxbase) + vcpkg_fixup_cmake_targets(CONFIG_PATH share/ppxbase) +endif() + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ppxbase RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/ppxbase/usage b/ports/ppxbase/usage index e0b266570ce38e..e3b566a72d8462 100644 --- a/ports/ppxbase/usage +++ b/ports/ppxbase/usage @@ -1,5 +1,6 @@ The package ppxbase is compatible with built-in CMake targets: find_package(ppxbase REQUIRED) - target_link_libraries(main PRIVATE ${PPXBASE_LIBRARIES}) - target_include_directories(main PRIVATE ${PPXBASE_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ppxbase) +or: + target_link_libraries(main PRIVATE ppxbase-static) diff --git a/ports/ppxnet/portfile.cmake b/ports/ppxnet/portfile.cmake index c2175932194cc8..e033951e6fa9c8 100644 --- a/ports/ppxnet/portfile.cmake +++ b/ports/ppxnet/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxnet - REF v1.0 - SHA512 1 + REF v1.6 + SHA512 403742cd72daa4fd3426596095ae7bfc4b39fb9eea1ace1f8afd42228cbdf276fc68921e671b2595c62502265dd30ee8d5471656fb2465c0f132d1df9f8c0bdd HEAD_REF master ) @@ -22,10 +22,18 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DBUILD_TESTS=OFF + OPTIONS_RELEASE + OPTIONS_DEBUG ) vcpkg_install_cmake() +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/ppxnet) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ppxnet) +elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/ppxnet) + vcpkg_fixup_cmake_targets(CONFIG_PATH share/ppxnet) +endif() + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ppxnet RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/ppxnet/usage b/ports/ppxnet/usage index 41d18f79e041cb..9ada7526a977e4 100644 --- a/ports/ppxnet/usage +++ b/ports/ppxnet/usage @@ -1,5 +1,6 @@ The package ppxnet is compatible with built-in CMake targets: find_package(ppxnet REQUIRED) - target_link_libraries(main PRIVATE ${PPXNET_LIBRARIES}) - target_include_directories(main PRIVATE ${PPXNET_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ppxnet) +or: + target_link_libraries(main PRIVATE ppxnet-static) From 1c019eec8032c273b41bf7f0bf0808d3d146253e Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Thu, 23 May 2019 17:25:43 +0800 Subject: [PATCH 04/28] update to v1.7 --- ports/ppxnet/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/ppxnet/portfile.cmake b/ports/ppxnet/portfile.cmake index e033951e6fa9c8..7004e547d55f6b 100644 --- a/ports/ppxnet/portfile.cmake +++ b/ports/ppxnet/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxnet - REF v1.6 - SHA512 403742cd72daa4fd3426596095ae7bfc4b39fb9eea1ace1f8afd42228cbdf276fc68921e671b2595c62502265dd30ee8d5471656fb2465c0f132d1df9f8c0bdd + REF v1.7 + SHA512 e30e1e5785d3bb0ff0c1e3ca119de78628e73fd9a9e6ce6e25c7264a18aaf2853b79e9b9d1044580e849b405bc7829cb2d0be296cba2d68a70e994f482725391 HEAD_REF master ) From 4302b430c6886296deefa8cb7aa9486f54403f6a Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Fri, 12 Jul 2019 10:49:23 +0800 Subject: [PATCH 05/28] + add duilib2 - update ppxbase, ppxnet. --- ports/duilib2/CONTROL | 7 +++++ ports/duilib2/portfile.cmake | 52 ++++++++++++++++++++++++++++++++++++ ports/duilib2/usage | 6 +++++ ports/ppxbase/portfile.cmake | 4 +-- ports/ppxnet/portfile.cmake | 4 +-- 5 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 ports/duilib2/CONTROL create mode 100644 ports/duilib2/portfile.cmake create mode 100644 ports/duilib2/usage diff --git a/ports/duilib2/CONTROL b/ports/duilib2/CONTROL new file mode 100644 index 00000000000000..aeedc2416fb2a6 --- /dev/null +++ b/ports/duilib2/CONTROL @@ -0,0 +1,7 @@ +Source: duilib2 +Version: 1.4 +Description: Duilib +Build-Depends: ppxbase + +Feature: cef +Description: Builds with cef module. \ No newline at end of file diff --git a/ports/duilib2/portfile.cmake b/ports/duilib2/portfile.cmake new file mode 100644 index 00000000000000..472bd092b0d64e --- /dev/null +++ b/ports/duilib2/portfile.cmake @@ -0,0 +1,52 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO winsoft666/duilib2 + REF v1.13 + SHA512 9753097e3eddeb9be25d32c893b57398503bffe89cefdd997a2a7d94c2e019014e54e0fc76b2181b0665f2930dad8e49844045cdd544bc21feb995f154a8c947 + HEAD_REF master +) + + +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(BUILD_SHARED_LIBS OFF) +else() + set(BUILD_SHARED_LIBS ON) +endif() + +set(UILIB_WITH_CEF OFF) +if("cef" IN_LIST FEATURES) + set(UILIB_WITH_CEF ON) + message(STATUS "UILIB_WITH_CEF=ON") +endif() + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} + -DBUILD_TESTS=OFF + -DUILIB_WITH_CEF=${UILIB_WITH_CEF} + OPTIONS_RELEASE + OPTIONS_DEBUG +) + +vcpkg_install_cmake() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/duilib2) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/duilib2) +elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/duilib2) + vcpkg_fixup_cmake_targets(CONFIG_PATH share/duilib2) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/duilib2 RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + + +vcpkg_copy_pdbs() + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + diff --git a/ports/duilib2/usage b/ports/duilib2/usage new file mode 100644 index 00000000000000..3c42b1383ffefd --- /dev/null +++ b/ports/duilib2/usage @@ -0,0 +1,6 @@ +The package duilib2 is compatible with built-in CMake targets: + + find_package(duilib2 REQUIRED) + target_link_libraries(main PRIVATE duilib2) +or: + target_link_libraries(main PRIVATE duilib2-static) diff --git a/ports/ppxbase/portfile.cmake b/ports/ppxbase/portfile.cmake index b7b59e06818ee7..b6521c0c6a284c 100644 --- a/ports/ppxbase/portfile.cmake +++ b/ports/ppxbase/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxbase - REF v1.17 - SHA512 8029c26d53f518b2e5ac6273cea26f19b4cce9bbc72291eb741e01cea973450ef6dfff2ba36d363dd19dfab902360ae0911db5d64c86ab895e2028422ec9eb10 + REF v1.21 + SHA512 fa3a959776570704afa8282db66666ebd265d3ffd8cc946abc697dcf2e98a71ab694e290229bb19f760d48f371357463de964ed9e24b0bf272b00b382dfb44c4 HEAD_REF master ) diff --git a/ports/ppxnet/portfile.cmake b/ports/ppxnet/portfile.cmake index 7004e547d55f6b..9210421ccebf29 100644 --- a/ports/ppxnet/portfile.cmake +++ b/ports/ppxnet/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxnet - REF v1.7 - SHA512 e30e1e5785d3bb0ff0c1e3ca119de78628e73fd9a9e6ce6e25c7264a18aaf2853b79e9b9d1044580e849b405bc7829cb2d0be296cba2d68a70e994f482725391 + REF v1.10 + SHA512 de2a1ee32a182a3aba9c3c83f391eb65c04c41a8670571b7199bbcdd75eceb7754c7c0016b018b6c25e556cd7eef85dbb60cc4b8469987f6f171e289d873c826 HEAD_REF master ) From eecaab4faf0b2650485d73c0088d25bd1ca50571 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Mon, 5 Aug 2019 16:54:02 +0800 Subject: [PATCH 06/28] set VCPKG_PLATFORM_TOOLSET to vc141. duilib2/ppxbase/ppxnet port. --- ports/duilib2/portfile.cmake | 4 ++-- ports/ppxbase/portfile.cmake | 4 ++-- ports/ppxnet/portfile.cmake | 4 ++-- triplets/x64-windows-static.cmake | 2 +- triplets/x64-windows.cmake | 2 +- triplets/x86-windows-static.cmake | 2 +- triplets/x86-windows.cmake | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ports/duilib2/portfile.cmake b/ports/duilib2/portfile.cmake index 472bd092b0d64e..f31dc96b757625 100644 --- a/ports/duilib2/portfile.cmake +++ b/ports/duilib2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/duilib2 - REF v1.13 - SHA512 9753097e3eddeb9be25d32c893b57398503bffe89cefdd997a2a7d94c2e019014e54e0fc76b2181b0665f2930dad8e49844045cdd544bc21feb995f154a8c947 + REF v1.18 + SHA512 449f7806e570b8b952fc922695093c57f006d4f99283271c692641443fbb9b935118636a29e4882dadabbda8c32b38d0d3da3ddcb33ad6a913d89db2065e7fc6 HEAD_REF master ) diff --git a/ports/ppxbase/portfile.cmake b/ports/ppxbase/portfile.cmake index b6521c0c6a284c..37b31eb4499c89 100644 --- a/ports/ppxbase/portfile.cmake +++ b/ports/ppxbase/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxbase - REF v1.21 - SHA512 fa3a959776570704afa8282db66666ebd265d3ffd8cc946abc697dcf2e98a71ab694e290229bb19f760d48f371357463de964ed9e24b0bf272b00b382dfb44c4 + REF v1.26 + SHA512 17e612ed9a2aacd52a27ec7cfb4aa6371e5f1053268eff6531df1f5dabb5d60f4a61bfeab3daf571bb629dc6e9f9e3238119375c6a0da6629f6c5f98619e4572 HEAD_REF master ) diff --git a/ports/ppxnet/portfile.cmake b/ports/ppxnet/portfile.cmake index 9210421ccebf29..cd6adac79f0e5d 100644 --- a/ports/ppxnet/portfile.cmake +++ b/ports/ppxnet/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxnet - REF v1.10 - SHA512 de2a1ee32a182a3aba9c3c83f391eb65c04c41a8670571b7199bbcdd75eceb7754c7c0016b018b6c25e556cd7eef85dbb60cc4b8469987f6f171e289d873c826 + REF v1.13 + SHA512 c785e298ecd65b90eea965fc1cf6cbf76b2d0b32cc676b82b28c91443863d37881b0bc5558f77966e8965dadeb0377b909721b85eddd1192dc322d0623555753 HEAD_REF master ) diff --git a/triplets/x64-windows-static.cmake b/triplets/x64-windows-static.cmake index 0dc68ffdd67158..b979d1a75e9829 100644 --- a/triplets/x64-windows-static.cmake +++ b/triplets/x64-windows-static.cmake @@ -1,4 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_PLATFORM_TOOLSET v140) +set(VCPKG_PLATFORM_TOOLSET v141) diff --git a/triplets/x64-windows.cmake b/triplets/x64-windows.cmake index 90aeb74b0e8e22..3f915493da241f 100644 --- a/triplets/x64-windows.cmake +++ b/triplets/x64-windows.cmake @@ -1,4 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_PLATFORM_TOOLSET v140) +set(VCPKG_PLATFORM_TOOLSET v141) diff --git a/triplets/x86-windows-static.cmake b/triplets/x86-windows-static.cmake index 4990a6073f3f44..e48faac25aaac6 100644 --- a/triplets/x86-windows-static.cmake +++ b/triplets/x86-windows-static.cmake @@ -1,4 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_PLATFORM_TOOLSET v140) +set(VCPKG_PLATFORM_TOOLSET v141) diff --git a/triplets/x86-windows.cmake b/triplets/x86-windows.cmake index 30e1d4546c5123..2f35c4a1e53fb5 100644 --- a/triplets/x86-windows.cmake +++ b/triplets/x86-windows.cmake @@ -1,4 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_PLATFORM_TOOLSET v140) \ No newline at end of file +set(VCPKG_PLATFORM_TOOLSET v141) \ No newline at end of file From 7d0ee944fef8c658a7ed5cb786c303319323f807 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Fri, 30 Aug 2019 17:39:54 +0800 Subject: [PATCH 07/28] library version. --- ports/duilib2/portfile.cmake | 4 ++-- ports/ppxbase/portfile.cmake | 4 ++-- ports/ppxnet/portfile.cmake | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/duilib2/portfile.cmake b/ports/duilib2/portfile.cmake index f31dc96b757625..0401ade42a6b1b 100644 --- a/ports/duilib2/portfile.cmake +++ b/ports/duilib2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/duilib2 - REF v1.18 - SHA512 449f7806e570b8b952fc922695093c57f006d4f99283271c692641443fbb9b935118636a29e4882dadabbda8c32b38d0d3da3ddcb33ad6a913d89db2065e7fc6 + REF v1.25 + SHA512 6875aa52744fb4a7810eff9fffc86f9152fa9fa307d77b7a00c5ea54c9d2556e0955461ec8ced99f2d54e58c5db7b7a767a8527f01bcb822bf0b2787cb39ad06 HEAD_REF master ) diff --git a/ports/ppxbase/portfile.cmake b/ports/ppxbase/portfile.cmake index 37b31eb4499c89..ed654f47e083b7 100644 --- a/ports/ppxbase/portfile.cmake +++ b/ports/ppxbase/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxbase - REF v1.26 - SHA512 17e612ed9a2aacd52a27ec7cfb4aa6371e5f1053268eff6531df1f5dabb5d60f4a61bfeab3daf571bb629dc6e9f9e3238119375c6a0da6629f6c5f98619e4572 + REF v1.31 + SHA512 e526c8b1235b976b1648c08f7855cdd08102ea0232705e484e09948e505a930db5b22f79156775cf1a2d73b8bfad955b1b77c03543df0780a7a5f025a7ba9301 HEAD_REF master ) diff --git a/ports/ppxnet/portfile.cmake b/ports/ppxnet/portfile.cmake index cd6adac79f0e5d..a0032da196585b 100644 --- a/ports/ppxnet/portfile.cmake +++ b/ports/ppxnet/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxnet - REF v1.13 - SHA512 c785e298ecd65b90eea965fc1cf6cbf76b2d0b32cc676b82b28c91443863d37881b0bc5558f77966e8965dadeb0377b909721b85eddd1192dc322d0623555753 + REF v1.14 + SHA512 ac23e738036b4236ebc19a4c944ef2d71fd1ed5b4f15efc522d9d76e3f60c857e5c6f9c999790f31cf4a2e3b58996435c084f0ff5b1348300b8d444f40ee981e HEAD_REF master ) From a4a009c24888449f6dbfc54924b1c8a6d6da37c9 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Mon, 21 Oct 2019 10:16:34 +0800 Subject: [PATCH 08/28] duilib2, ppxbase version. --- ports/duilib2/portfile.cmake | 4 ++-- ports/ppxbase/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/duilib2/portfile.cmake b/ports/duilib2/portfile.cmake index 0401ade42a6b1b..a744d90026af98 100644 --- a/ports/duilib2/portfile.cmake +++ b/ports/duilib2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/duilib2 - REF v1.25 - SHA512 6875aa52744fb4a7810eff9fffc86f9152fa9fa307d77b7a00c5ea54c9d2556e0955461ec8ced99f2d54e58c5db7b7a767a8527f01bcb822bf0b2787cb39ad06 + REF v1.27 + SHA512 e107a495337dc2c13eb1dafb7b167bfb111c67a755c6198bade418952fb0f42b7ed07c6c696c7a3aec32b1cf46f77ae327f19902b3210e493604da8e4a386d86 HEAD_REF master ) diff --git a/ports/ppxbase/portfile.cmake b/ports/ppxbase/portfile.cmake index ed654f47e083b7..36d0cd519e04b3 100644 --- a/ports/ppxbase/portfile.cmake +++ b/ports/ppxbase/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxbase - REF v1.31 - SHA512 e526c8b1235b976b1648c08f7855cdd08102ea0232705e484e09948e505a930db5b22f79156775cf1a2d73b8bfad955b1b77c03543df0780a7a5f025a7ba9301 + REF v1.35 + SHA512 7d418c8d0b00559216c861656c1fb3bfda8d34044fbd07e5bc3acddd27623eb7a07a986fc6bac22dde2fdf3edd165b78e8e5ef7f4bc9f17975d7cdd696942168 HEAD_REF master ) From da424164737a67045cc047850d18b8b8af05eb7f Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Mon, 11 Nov 2019 16:36:58 +0800 Subject: [PATCH 09/28] duilib2 version --- ports/duilib2/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/duilib2/portfile.cmake b/ports/duilib2/portfile.cmake index a744d90026af98..6ebd293f5b410d 100644 --- a/ports/duilib2/portfile.cmake +++ b/ports/duilib2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/duilib2 - REF v1.27 - SHA512 e107a495337dc2c13eb1dafb7b167bfb111c67a755c6198bade418952fb0f42b7ed07c6c696c7a3aec32b1cf46f77ae327f19902b3210e493604da8e4a386d86 + REF v1.30 + SHA512 3900df0c2a40e99f964a9ee0b31b5e54933d5dfa153253320257f46d5dd9b5e949511bf5cd41d2d3a6f21fd1374a4d0827f54f7401fad4006b90c889745d876e HEAD_REF master ) From 2fe5bbe448cfd5b971179ffc9b5818681c9c6861 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Wed, 27 Nov 2019 18:19:04 +0800 Subject: [PATCH 10/28] update duilib2/ppxbase version. --- ports/duilib2/portfile.cmake | 4 ++-- ports/ppxbase/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/duilib2/portfile.cmake b/ports/duilib2/portfile.cmake index 6ebd293f5b410d..605d33172a24ec 100644 --- a/ports/duilib2/portfile.cmake +++ b/ports/duilib2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/duilib2 - REF v1.30 - SHA512 3900df0c2a40e99f964a9ee0b31b5e54933d5dfa153253320257f46d5dd9b5e949511bf5cd41d2d3a6f21fd1374a4d0827f54f7401fad4006b90c889745d876e + REF v1.33 + SHA512 9501366ebb87ef60f92abafacc57d3265484c3c612b6ceaa6a233c905d85abea20b437838deb475f2dfcd55d066f0d26211b2bc60e1706a5f13da922966c1846 HEAD_REF master ) diff --git a/ports/ppxbase/portfile.cmake b/ports/ppxbase/portfile.cmake index 36d0cd519e04b3..fff98b8f8f98b2 100644 --- a/ports/ppxbase/portfile.cmake +++ b/ports/ppxbase/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxbase - REF v1.35 - SHA512 7d418c8d0b00559216c861656c1fb3bfda8d34044fbd07e5bc3acddd27623eb7a07a986fc6bac22dde2fdf3edd165b78e8e5ef7f4bc9f17975d7cdd696942168 + REF v1.36 + SHA512 196f50e1bcef0a619a55d6a54f53d1405d9b85b950b9f836bb8bce9515feba36d3da1d19775c8a20067944b5786e02140da0fc0d9ed4aacece258c01c7e44b92 HEAD_REF master ) From e68269f31d836228835ed6f0e5baee351f354cd9 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Mon, 2 Dec 2019 15:12:47 +0800 Subject: [PATCH 11/28] update duilib2 code version. --- ports/duilib2/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/duilib2/portfile.cmake b/ports/duilib2/portfile.cmake index 605d33172a24ec..8cbcb1ead3ab9d 100644 --- a/ports/duilib2/portfile.cmake +++ b/ports/duilib2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/duilib2 - REF v1.33 - SHA512 9501366ebb87ef60f92abafacc57d3265484c3c612b6ceaa6a233c905d85abea20b437838deb475f2dfcd55d066f0d26211b2bc60e1706a5f13da922966c1846 + REF v1.34 + SHA512 672ba44b7603a4256b78e67c2049e2246e551ad95deb701636b24305f08485447fa45fa3bbd4464e0da78e22cfeb19932da88996d0f5b9525b4f7ae9841d38e2 HEAD_REF master ) From ea7a9e6500f2189db7bb0904c5d0f3f17c3e75ce Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Tue, 17 Dec 2019 13:56:35 +0800 Subject: [PATCH 12/28] update ppxbase version. update duilib2 version. --- ports/duilib2/portfile.cmake | 4 ++-- ports/ppxbase/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/duilib2/portfile.cmake b/ports/duilib2/portfile.cmake index 8cbcb1ead3ab9d..7f98d2746a3afa 100644 --- a/ports/duilib2/portfile.cmake +++ b/ports/duilib2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/duilib2 - REF v1.34 - SHA512 672ba44b7603a4256b78e67c2049e2246e551ad95deb701636b24305f08485447fa45fa3bbd4464e0da78e22cfeb19932da88996d0f5b9525b4f7ae9841d38e2 + REF v1.35 + SHA512 a2bd6e8e9f3bc1e02394034ce7704ec3b2d4a88d0e2181e656c7610bb743545ca57c2f46f4e86e0fb119c6ee06830d8bbe13a0bb6d67422c1756592a8b466318 HEAD_REF master ) diff --git a/ports/ppxbase/portfile.cmake b/ports/ppxbase/portfile.cmake index fff98b8f8f98b2..161b21e6b1429c 100644 --- a/ports/ppxbase/portfile.cmake +++ b/ports/ppxbase/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxbase - REF v1.36 - SHA512 196f50e1bcef0a619a55d6a54f53d1405d9b85b950b9f836bb8bce9515feba36d3da1d19775c8a20067944b5786e02140da0fc0d9ed4aacece258c01c7e44b92 + REF v1.38 + SHA512 84d1b72f05ba22c0b71fcf9d58d118071edff90741687708d39c3c4a6381730b397cb759f799f75a694ee3a694a1b06d25c6552574888df77dab86299d256e18 HEAD_REF master ) From e303968af0019ee41107ef4095265b7e51ea9586 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Tue, 17 Dec 2019 15:02:16 +0800 Subject: [PATCH 13/28] update ppxbase/duilib2 cmake config. --- ports/duilib2/CONTROL | 1 + ports/duilib2/portfile.cmake | 8 +++----- ports/ppxbase/CONTROL | 1 + ports/ppxbase/portfile.cmake | 10 +++------- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ports/duilib2/CONTROL b/ports/duilib2/CONTROL index aeedc2416fb2a6..d7b5eb1699e51c 100644 --- a/ports/duilib2/CONTROL +++ b/ports/duilib2/CONTROL @@ -2,6 +2,7 @@ Source: duilib2 Version: 1.4 Description: Duilib Build-Depends: ppxbase +Homepage: https://github.com/winsoft666/duilib2 Feature: cef Description: Builds with cef module. \ No newline at end of file diff --git a/ports/duilib2/portfile.cmake b/ports/duilib2/portfile.cmake index 7f98d2746a3afa..c289021676b6e5 100644 --- a/ports/duilib2/portfile.cmake +++ b/ports/duilib2/portfile.cmake @@ -3,13 +3,13 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/duilib2 - REF v1.35 - SHA512 a2bd6e8e9f3bc1e02394034ce7704ec3b2d4a88d0e2181e656c7610bb743545ca57c2f46f4e86e0fb119c6ee06830d8bbe13a0bb6d67422c1756592a8b466318 + REF 43cbb1b6217a3f0eaf86cf896815a801674b5570 + SHA512 3f344cbcb3e8e7d3246ddb2edeb4394b4979de4eb7f9edae4f5aff6743332c13f6f972d895cf717f35449f7cb56ad39ff078ac7969748a4542cab0749a43a112 HEAD_REF master ) -if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") +if("VCPKG_LIBRARY_LINKAGE" STREQUAL "static") set(BUILD_SHARED_LIBS OFF) else() set(BUILD_SHARED_LIBS ON) @@ -29,8 +29,6 @@ vcpkg_configure_cmake( -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DBUILD_TESTS=OFF -DUILIB_WITH_CEF=${UILIB_WITH_CEF} - OPTIONS_RELEASE - OPTIONS_DEBUG ) vcpkg_install_cmake() diff --git a/ports/ppxbase/CONTROL b/ports/ppxbase/CONTROL index d876a4ab1be6e5..669e7b2a380104 100644 --- a/ports/ppxbase/CONTROL +++ b/ports/ppxbase/CONTROL @@ -1,3 +1,4 @@ Source: ppxbase Version: 1.15 Description: C++ Common Library. +Homepage: https://github.com/winsoft666/ppxbase \ No newline at end of file diff --git a/ports/ppxbase/portfile.cmake b/ports/ppxbase/portfile.cmake index 161b21e6b1429c..914acbf6363c97 100644 --- a/ports/ppxbase/portfile.cmake +++ b/ports/ppxbase/portfile.cmake @@ -1,15 +1,13 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxbase - REF v1.38 - SHA512 84d1b72f05ba22c0b71fcf9d58d118071edff90741687708d39c3c4a6381730b397cb759f799f75a694ee3a694a1b06d25c6552574888df77dab86299d256e18 + REF bff0968c6fcd71f68cf9a9aae5359b6fb98ab2d2 + SHA512 a6259d6633e9173981d725628ac06b7e5faea9bbd04c6afbf6af3e2da0a461ec72ee45e0c1755781a48bc2c4bbd04892f042078a46816c37374450ee8827f453 HEAD_REF master ) -if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") +if("VCPKG_LIBRARY_LINKAGE" STREQUAL "static") set(BUILD_SHARED_LIBS OFF) else() set(BUILD_SHARED_LIBS ON) @@ -22,8 +20,6 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DBUILD_TESTS=OFF - OPTIONS_RELEASE - OPTIONS_DEBUG ) vcpkg_install_cmake() From 7900286a76785955be809257ee802081b03ab7b0 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Fri, 20 Dec 2019 09:21:05 +0800 Subject: [PATCH 14/28] duilib2 version. --- ports/duilib2/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/duilib2/portfile.cmake b/ports/duilib2/portfile.cmake index c289021676b6e5..c24ee2212baf97 100644 --- a/ports/duilib2/portfile.cmake +++ b/ports/duilib2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/duilib2 - REF 43cbb1b6217a3f0eaf86cf896815a801674b5570 - SHA512 3f344cbcb3e8e7d3246ddb2edeb4394b4979de4eb7f9edae4f5aff6743332c13f6f972d895cf717f35449f7cb56ad39ff078ac7969748a4542cab0749a43a112 + REF 539d423fe0b7afc6fefe31325c2d2879de84e704 + SHA512 c9ce63a18bb486329b3f9273e7f05ba5208af566cf5c67eb4eee09e824dba71e467e39f9274474b3e83ffbec6d89c6b8ea2bfbb862a8a18de87d418b21d26e34 HEAD_REF master ) From ccb8b11243f6198f34b9dbe475393987d10e4ce8 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Fri, 27 Dec 2019 10:12:06 +0800 Subject: [PATCH 15/28] ppxbase version. --- ports/ppxbase/portfile.cmake | 24 +++++++++--------------- ports/ppxbase/usage | 6 ------ 2 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 ports/ppxbase/usage diff --git a/ports/ppxbase/portfile.cmake b/ports/ppxbase/portfile.cmake index 914acbf6363c97..3b7c65662a551d 100644 --- a/ports/ppxbase/portfile.cmake +++ b/ports/ppxbase/portfile.cmake @@ -1,27 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxbase - REF bff0968c6fcd71f68cf9a9aae5359b6fb98ab2d2 - SHA512 a6259d6633e9173981d725628ac06b7e5faea9bbd04c6afbf6af3e2da0a461ec72ee45e0c1755781a48bc2c4bbd04892f042078a46816c37374450ee8827f453 + REF 289f55183a76d924cbba650124e17efb4d9a9d7c + SHA512 57517cddb43ce0fad64aa4ce91e95174e2a1102bc17e548f02cfc9e9a3601ed14681be1cb214ed6afd8b69ce7cfb2964bd93d755d06e55d7da2e6ca6a9642aa2 HEAD_REF master ) -if("VCPKG_LIBRARY_LINKAGE" STREQUAL "static") - set(BUILD_SHARED_LIBS OFF) -else() - set(BUILD_SHARED_LIBS ON) -endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + PREFER_NINJA OPTIONS - -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} - -DBUILD_TESTS=OFF + -DBUILD_TESTS:BOOL=OFF ) +vcpkg_fail_port_install(ON_TARGET "x64-uwp") +vcpkg_fail_port_install(ON_TARGET "arm-uwp") +vcpkg_fail_port_install(ON_TARGET "arm64-windows") + vcpkg_install_cmake() if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/ppxbase) @@ -34,7 +31,4 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pp file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -vcpkg_copy_pdbs() - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - +vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/ppxbase/usage b/ports/ppxbase/usage deleted file mode 100644 index e3b566a72d8462..00000000000000 --- a/ports/ppxbase/usage +++ /dev/null @@ -1,6 +0,0 @@ -The package ppxbase is compatible with built-in CMake targets: - - find_package(ppxbase REQUIRED) - target_link_libraries(main PRIVATE ppxbase) -or: - target_link_libraries(main PRIVATE ppxbase-static) From 1e19192b497d945de41cbf5853ce6b9c37641468 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Fri, 27 Dec 2019 12:21:57 +0800 Subject: [PATCH 16/28] + add akali library. --- ports/akali/CONTROL | 4 ++++ ports/{ppxbase => akali}/portfile.cmake | 18 ++++++++---------- ports/ppxbase/CONTROL | 4 ---- 3 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 ports/akali/CONTROL rename ports/{ppxbase => akali}/portfile.cmake (53%) delete mode 100644 ports/ppxbase/CONTROL diff --git a/ports/akali/CONTROL b/ports/akali/CONTROL new file mode 100644 index 00000000000000..2aa6b0d6c817c5 --- /dev/null +++ b/ports/akali/CONTROL @@ -0,0 +1,4 @@ +Source: akali +Version: 1.39 +Description: C++ Common Library. +Homepage: https://github.com/winsoft666/akali \ No newline at end of file diff --git a/ports/ppxbase/portfile.cmake b/ports/akali/portfile.cmake similarity index 53% rename from ports/ppxbase/portfile.cmake rename to ports/akali/portfile.cmake index 3b7c65662a551d..f90dade5536e60 100644 --- a/ports/ppxbase/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO winsoft666/ppxbase - REF 289f55183a76d924cbba650124e17efb4d9a9d7c - SHA512 57517cddb43ce0fad64aa4ce91e95174e2a1102bc17e548f02cfc9e9a3601ed14681be1cb214ed6afd8b69ce7cfb2964bd93d755d06e55d7da2e6ca6a9642aa2 + REPO winsoft666/akali + REF abb9c44fa0a30d736f66c4e67ca730662916bd91 + SHA512 ed0c8d25f370b4f677f52e1173dbc5adad890d8d8bfb94841555da0e03a335f0435affe493bedf99eb3b0dbe23bf3ad96fbbd3d443325668f0a9df60778654fa HEAD_REF master ) - - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -21,13 +19,13 @@ vcpkg_fail_port_install(ON_TARGET "arm64-windows") vcpkg_install_cmake() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/ppxbase) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ppxbase) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/ppxbase) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/ppxbase) +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/akali) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/akali) +elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/akali) + vcpkg_fixup_cmake_targets(CONFIG_PATH share/akali) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ppxbase RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/akali RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/ppxbase/CONTROL b/ports/ppxbase/CONTROL deleted file mode 100644 index 669e7b2a380104..00000000000000 --- a/ports/ppxbase/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ppxbase -Version: 1.15 -Description: C++ Common Library. -Homepage: https://github.com/winsoft666/ppxbase \ No newline at end of file From 23917ea3d115bb0d1b0076dce063ba314f0eefac Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Fri, 27 Dec 2019 12:23:53 +0800 Subject: [PATCH 17/28] update ports script. --- ports/duilib2/portfile.cmake | 13 +------------ ports/duilib2/usage | 6 ------ ports/ppxnet/portfile.cmake | 14 +------------- ports/ppxnet/usage | 6 ------ 4 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 ports/duilib2/usage delete mode 100644 ports/ppxnet/usage diff --git a/ports/duilib2/portfile.cmake b/ports/duilib2/portfile.cmake index c24ee2212baf97..2dc68bec69f029 100644 --- a/ports/duilib2/portfile.cmake +++ b/ports/duilib2/portfile.cmake @@ -9,12 +9,6 @@ vcpkg_from_github( ) -if("VCPKG_LIBRARY_LINKAGE" STREQUAL "static") - set(BUILD_SHARED_LIBS OFF) -else() - set(BUILD_SHARED_LIBS ON) -endif() - set(UILIB_WITH_CEF OFF) if("cef" IN_LIST FEATURES) set(UILIB_WITH_CEF ON) @@ -26,7 +20,6 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DBUILD_TESTS=OFF -DUILIB_WITH_CEF=${UILIB_WITH_CEF} ) @@ -43,8 +36,4 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/du file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -vcpkg_copy_pdbs() - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - +vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/duilib2/usage b/ports/duilib2/usage deleted file mode 100644 index 3c42b1383ffefd..00000000000000 --- a/ports/duilib2/usage +++ /dev/null @@ -1,6 +0,0 @@ -The package duilib2 is compatible with built-in CMake targets: - - find_package(duilib2 REQUIRED) - target_link_libraries(main PRIVATE duilib2) -or: - target_link_libraries(main PRIVATE duilib2-static) diff --git a/ports/ppxnet/portfile.cmake b/ports/ppxnet/portfile.cmake index a0032da196585b..05c16cbad2fa51 100644 --- a/ports/ppxnet/portfile.cmake +++ b/ports/ppxnet/portfile.cmake @@ -8,19 +8,10 @@ vcpkg_from_github( HEAD_REF master ) - -if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") - set(BUILD_SHARED_LIBS OFF) -else() - set(BUILD_SHARED_LIBS ON) -endif() - - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DBUILD_TESTS=OFF OPTIONS_RELEASE OPTIONS_DEBUG @@ -38,7 +29,4 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pp file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -vcpkg_copy_pdbs() - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - +vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/ppxnet/usage b/ports/ppxnet/usage deleted file mode 100644 index 9ada7526a977e4..00000000000000 --- a/ports/ppxnet/usage +++ /dev/null @@ -1,6 +0,0 @@ -The package ppxnet is compatible with built-in CMake targets: - - find_package(ppxnet REQUIRED) - target_link_libraries(main PRIVATE ppxnet) -or: - target_link_libraries(main PRIVATE ppxnet-static) From a829a096765783bea8cbee5cc883cf82c103a2f7 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Fri, 27 Dec 2019 15:11:03 +0800 Subject: [PATCH 18/28] ports update. --- ports/akali/portfile.cmake | 4 ++-- ports/duilib2/CONTROL | 1 - ports/ppxnet/CONTROL | 2 +- ports/ppxnet/portfile.cmake | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index f90dade5536e60..b1ece295c803b4 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali - REF abb9c44fa0a30d736f66c4e67ca730662916bd91 - SHA512 ed0c8d25f370b4f677f52e1173dbc5adad890d8d8bfb94841555da0e03a335f0435affe493bedf99eb3b0dbe23bf3ad96fbbd3d443325668f0a9df60778654fa + REF f24058a7c75ffcd794748edd7548f4b40cf78597 + SHA512 fa9a5fe54eddab283fd8ef9129867870c1dcaf84e3b2218fb55b1671131ec8f01cc18885346b34ee51c2060a85850389ad1a10f41ef7740e5b67bee351742177 HEAD_REF master ) diff --git a/ports/duilib2/CONTROL b/ports/duilib2/CONTROL index d7b5eb1699e51c..1e94d43ac0a2f4 100644 --- a/ports/duilib2/CONTROL +++ b/ports/duilib2/CONTROL @@ -1,7 +1,6 @@ Source: duilib2 Version: 1.4 Description: Duilib -Build-Depends: ppxbase Homepage: https://github.com/winsoft666/duilib2 Feature: cef diff --git a/ports/ppxnet/CONTROL b/ports/ppxnet/CONTROL index ec778199180625..4ff724327af78f 100644 --- a/ports/ppxnet/CONTROL +++ b/ports/ppxnet/CONTROL @@ -1,4 +1,4 @@ Source: ppxnet Version: 1.1 Description: C++ Network library -Build-Depends: ppxbase +Build-Depends: akali diff --git a/ports/ppxnet/portfile.cmake b/ports/ppxnet/portfile.cmake index 05c16cbad2fa51..1b3de847c6a090 100644 --- a/ports/ppxnet/portfile.cmake +++ b/ports/ppxnet/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/ppxnet - REF v1.14 - SHA512 ac23e738036b4236ebc19a4c944ef2d71fd1ed5b4f15efc522d9d76e3f60c857e5c6f9c999790f31cf4a2e3b58996435c084f0ff5b1348300b8d444f40ee981e + REF 21ec363d3af5d63227256d153da744d42b87dedc + SHA512 55930729330845fd3df3a67b032833567917db08c4a75888623e795a462393fc74509c7c11a3808f530910bb77156cfa98ce6b162690058c45cf981af66445f5 HEAD_REF master ) From 9d65a1dc46e0ce37dbe6049fc1f4d94c6f1f5dd2 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Fri, 27 Dec 2019 16:07:23 +0800 Subject: [PATCH 19/28] add akali --- scripts/ci.baseline.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bc2f38650f0259..2b4f7dd9471786 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1813,5 +1813,7 @@ zeromq:x64-uwp=fail ## Add new items alphabetically - +akali:x64-uwp=fail +akali:arm-uwp=fail +akali:arm64-windows=fail From 2eb0ea1df07c14d6736ea103de77e2a09e6d33c0 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Fri, 27 Dec 2019 16:29:36 +0800 Subject: [PATCH 20/28] remove duilib2/ppxnet --- ports/duilib2/CONTROL | 7 ------- ports/duilib2/portfile.cmake | 39 ------------------------------------ ports/ppxnet/CONTROL | 4 ---- ports/ppxnet/portfile.cmake | 32 ----------------------------- 4 files changed, 82 deletions(-) delete mode 100644 ports/duilib2/CONTROL delete mode 100644 ports/duilib2/portfile.cmake delete mode 100644 ports/ppxnet/CONTROL delete mode 100644 ports/ppxnet/portfile.cmake diff --git a/ports/duilib2/CONTROL b/ports/duilib2/CONTROL deleted file mode 100644 index 1e94d43ac0a2f4..00000000000000 --- a/ports/duilib2/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: duilib2 -Version: 1.4 -Description: Duilib -Homepage: https://github.com/winsoft666/duilib2 - -Feature: cef -Description: Builds with cef module. \ No newline at end of file diff --git a/ports/duilib2/portfile.cmake b/ports/duilib2/portfile.cmake deleted file mode 100644 index 2dc68bec69f029..00000000000000 --- a/ports/duilib2/portfile.cmake +++ /dev/null @@ -1,39 +0,0 @@ -include(vcpkg_common_functions) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO winsoft666/duilib2 - REF 539d423fe0b7afc6fefe31325c2d2879de84e704 - SHA512 c9ce63a18bb486329b3f9273e7f05ba5208af566cf5c67eb4eee09e824dba71e467e39f9274474b3e83ffbec6d89c6b8ea2bfbb862a8a18de87d418b21d26e34 - HEAD_REF master -) - - -set(UILIB_WITH_CEF OFF) -if("cef" IN_LIST FEATURES) - set(UILIB_WITH_CEF ON) - message(STATUS "UILIB_WITH_CEF=ON") -endif() - - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DBUILD_TESTS=OFF - -DUILIB_WITH_CEF=${UILIB_WITH_CEF} -) - -vcpkg_install_cmake() - -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/duilib2) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/duilib2) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/duilib2) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/duilib2) -endif() - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/duilib2 RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/ppxnet/CONTROL b/ports/ppxnet/CONTROL deleted file mode 100644 index 4ff724327af78f..00000000000000 --- a/ports/ppxnet/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ppxnet -Version: 1.1 -Description: C++ Network library -Build-Depends: akali diff --git a/ports/ppxnet/portfile.cmake b/ports/ppxnet/portfile.cmake deleted file mode 100644 index 1b3de847c6a090..00000000000000 --- a/ports/ppxnet/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -include(vcpkg_common_functions) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO winsoft666/ppxnet - REF 21ec363d3af5d63227256d153da744d42b87dedc - SHA512 55930729330845fd3df3a67b032833567917db08c4a75888623e795a462393fc74509c7c11a3808f530910bb77156cfa98ce6b162690058c45cf981af66445f5 - HEAD_REF master -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DBUILD_TESTS=OFF - OPTIONS_RELEASE - OPTIONS_DEBUG -) - -vcpkg_install_cmake() - -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/ppxnet) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ppxnet) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/ppxnet) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/ppxnet) -endif() - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ppxnet RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -vcpkg_copy_pdbs() \ No newline at end of file From 9c5daf64235bfc97aaf5b7980e21261610d144f6 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Fri, 27 Dec 2019 16:32:44 +0800 Subject: [PATCH 21/28] revert --- triplets/x64-windows-static.cmake | 1 - triplets/x64-windows.cmake | 2 +- triplets/x86-windows-static.cmake | 3 +-- triplets/x86-windows.cmake | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/triplets/x64-windows-static.cmake b/triplets/x64-windows-static.cmake index b979d1a75e9829..75f9b95325ed5b 100644 --- a/triplets/x64-windows-static.cmake +++ b/triplets/x64-windows-static.cmake @@ -1,4 +1,3 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_PLATFORM_TOOLSET v141) diff --git a/triplets/x64-windows.cmake b/triplets/x64-windows.cmake index 3f915493da241f..d0be7297f0c468 100644 --- a/triplets/x64-windows.cmake +++ b/triplets/x64-windows.cmake @@ -1,4 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_PLATFORM_TOOLSET v141) + diff --git a/triplets/x86-windows-static.cmake b/triplets/x86-windows-static.cmake index e48faac25aaac6..c855f0caa0d489 100644 --- a/triplets/x86-windows-static.cmake +++ b/triplets/x86-windows-static.cmake @@ -1,4 +1,3 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE static) -set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_PLATFORM_TOOLSET v141) +set(VCPKG_LIBRARY_LINKAGE static) \ No newline at end of file diff --git a/triplets/x86-windows.cmake b/triplets/x86-windows.cmake index 2f35c4a1e53fb5..40ccbe152dc10c 100644 --- a/triplets/x86-windows.cmake +++ b/triplets/x86-windows.cmake @@ -1,4 +1,3 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_PLATFORM_TOOLSET v141) \ No newline at end of file From ef38c0288581a627eaca320eb7b188b4f9ff5f1d Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Fri, 27 Dec 2019 18:07:15 +0800 Subject: [PATCH 22/28] update akali version. --- ports/akali/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index b1ece295c803b4..8a0adb3fe20e4d 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali REF f24058a7c75ffcd794748edd7548f4b40cf78597 - SHA512 fa9a5fe54eddab283fd8ef9129867870c1dcaf84e3b2218fb55b1671131ec8f01cc18885346b34ee51c2060a85850389ad1a10f41ef7740e5b67bee351742177 + SHA512 4298bc97c5b99494f517e46a86a30dcd61e9d4cfdfa5dbb4c17957c8e866de8ed5b41b2f9a17261f96fc3c7b25fbac2003af4ad8ca675d3f59ce6176e1112220 HEAD_REF master ) From 36648b98a0e15e74562b971657f31675f1347c34 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Mon, 30 Dec 2019 09:40:40 +0800 Subject: [PATCH 23/28] update akali version. --- ports/akali/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index 8a0adb3fe20e4d..71cdbcb1e9d4d5 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali - REF f24058a7c75ffcd794748edd7548f4b40cf78597 + REF 07d855dd2da7cddb374646465799734e48e0adb2 SHA512 4298bc97c5b99494f517e46a86a30dcd61e9d4cfdfa5dbb4c17957c8e866de8ed5b41b2f9a17261f96fc3c7b25fbac2003af4ad8ca675d3f59ce6176e1112220 HEAD_REF master ) From 5fd4b7b72289d7bd2014b1fb7a250a61426e63e0 Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Mon, 30 Dec 2019 16:45:09 +0800 Subject: [PATCH 24/28] Update portfile.cmake --- ports/akali/portfile.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index 71cdbcb1e9d4d5..2c10a81432ce7a 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -13,9 +13,7 @@ vcpkg_configure_cmake( -DBUILD_TESTS:BOOL=OFF ) -vcpkg_fail_port_install(ON_TARGET "x64-uwp") -vcpkg_fail_port_install(ON_TARGET "arm-uwp") -vcpkg_fail_port_install(ON_TARGET "arm64-windows") +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") vcpkg_install_cmake() @@ -29,4 +27,4 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ak file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() From bf494d04a7f54405b580348cfaff5c12c65278fe Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Tue, 31 Dec 2019 17:34:25 +0800 Subject: [PATCH 25/28] Update portfile.cmake --- ports/akali/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index 2c10a81432ce7a..1c87179f88c5af 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -23,7 +23,7 @@ elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/akali) vcpkg_fixup_cmake_targets(CONFIG_PATH share/akali) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/akali RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) From ead76101594f736d8ead4bda6992b4655ad6c989 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Thu, 9 Jan 2020 17:12:07 +0800 Subject: [PATCH 26/28] [akali] Update to v1.41 --- ports/akali/CONTROL | 2 +- ports/akali/portfile.cmake | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ports/akali/CONTROL b/ports/akali/CONTROL index 2aa6b0d6c817c5..a7acd59194766c 100644 --- a/ports/akali/CONTROL +++ b/ports/akali/CONTROL @@ -1,4 +1,4 @@ Source: akali -Version: 1.39 +Version: 1.41 Description: C++ Common Library. Homepage: https://github.com/winsoft666/akali \ No newline at end of file diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index 1c87179f88c5af..96382207f1e550 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -1,15 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali - REF 07d855dd2da7cddb374646465799734e48e0adb2 - SHA512 4298bc97c5b99494f517e46a86a30dcd61e9d4cfdfa5dbb4c17957c8e866de8ed5b41b2f9a17261f96fc3c7b25fbac2003af4ad8ca675d3f59ce6176e1112220 + REF 9f095b9b2856a7678292f9d5f91c7cb27e9b5e42 + SHA512 d8afe01012cad802ef9c8be9df9fb3ccebb5feae41b4f5cd2f5d21f51fab0f1e948d6d9536a11d445c7954a5151d333cb52c82344cf952599dec1ca3276f5d0f HEAD_REF master ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DAKALI_STATIC:BOOL=${AKALI_STATIC} -DBUILD_TESTS:BOOL=OFF ) @@ -23,6 +26,14 @@ elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/akali) vcpkg_fixup_cmake_targets(CONFIG_PATH share/akali) endif() +file(READ ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h AKALI_EXPORT_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "#ifdef AKALI_STATIC" "#if 1" AKALI_EXPORT_H "${AKALI_EXPORT_H}") +else() + string(REPLACE "#ifdef AKALI_STATIC" "#if 0" AKALI_EXPORT_H "${AKALI_EXPORT_H}") +endif() +file(WRITE ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h "${AKALI_EXPORT_H}") + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) From e1a5454f3544fcecb586da724d1aef626bef3526 Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Fri, 10 Jan 2020 09:28:51 +0800 Subject: [PATCH 27/28] Update portfile.cmake --- ports/akali/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index 96382207f1e550..f7675551aef4cc 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali @@ -16,8 +18,6 @@ vcpkg_configure_cmake( -DBUILD_TESTS:BOOL=OFF ) -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_install_cmake() if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/akali) From d97127e1c0a9dadc028e81cc99713d4d78f286f4 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Fri, 10 Jan 2020 18:00:40 +0800 Subject: [PATCH 28/28] [akali] Update version. --- ports/akali/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index f7675551aef4cc..e1be350182db68 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali - REF 9f095b9b2856a7678292f9d5f91c7cb27e9b5e42 - SHA512 d8afe01012cad802ef9c8be9df9fb3ccebb5feae41b4f5cd2f5d21f51fab0f1e948d6d9536a11d445c7954a5151d333cb52c82344cf952599dec1ca3276f5d0f + REF aa0ee3b82cef325ca582fce30bf3bf177ed81e9b + SHA512 0d523191219b19bcf2becb2c9e78b32b50fbbd5a052dd5330e315a6310c0d5c322639434f710a37c6d98e23510506d294b52978f8487227d4461d29d4a6bb502 HEAD_REF master )