From 954aa35e6ead92546e14084c0fcde2cf7d0e0cef Mon Sep 17 00:00:00 2001 From: Sztergbaum Roman Date: Sat, 4 Aug 2018 06:34:14 +0200 Subject: [PATCH] [shiva] update shiva to 0.7.2 with proper plugins installation (#4014) --- ports/shiva-sfml/CONTROL | 2 +- ports/shiva-sfml/portfile.cmake | 29 +++++++++++++++++++++++++---- ports/shiva/CONTROL | 2 +- ports/shiva/portfile.cmake | 4 ++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/ports/shiva-sfml/CONTROL b/ports/shiva-sfml/CONTROL index 697a4eb2cc8..d912c277389 100644 --- a/ports/shiva-sfml/CONTROL +++ b/ports/shiva-sfml/CONTROL @@ -1,4 +1,4 @@ Source: shiva-sfml -Version: 0.7 +Version: 0.7.2 Description: shiva-sfml plugins of shiva C++ engine Build-Depends: sfml (windows), shiva diff --git a/ports/shiva-sfml/portfile.cmake b/ports/shiva-sfml/portfile.cmake index 72cd61344f7..3b4432de1e1 100644 --- a/ports/shiva-sfml/portfile.cmake +++ b/ports/shiva-sfml/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Milerius/shiva - REF 0.7 - SHA512 08591ce23ef717330c2fdc0518c383bebeda1a5eed93011b44280a409154729add70a0e913c2dae0d8332f4d6aee931ab8ba9957097435eadcff38e692e348ec + REF 0.7.2 + SHA512 0bd1543ba6067d303640820a17a24ec02c6ab8333f86bd3431c09f5a2ea4ca47379ec06a90e3a0658dba967504cb8a63f85c2f0cbfb51a7c59130b235948d600 HEAD_REF master ) @@ -22,9 +22,30 @@ file(GLOB PLUGINS ${SOURCE_PATH}/bin/systems/*) message(STATUS "PLUGINS -> ${PLUGINS}") vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shiva-sfml) + +##! Pre removing +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +##! Include file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/shiva-sfml) -file(COPY ${PLUGINS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + +##! Release +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/shiva) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/shiva/plugins) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/shiva/plugins/shiva-sfml) + +##! Debug +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/shiva) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/shiva/plugins) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/shiva/plugins/shiva-sfml) + +##! Copy Plugins +file(COPY ${PLUGINS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/shiva/plugins/shiva-sfml) +file(COPY ${PLUGINS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/shiva/plugins/shiva-sfml) + file(WRITE ${CURRENT_PACKAGES_DIR}/include/shiva-sfml/empty.h "") file(WRITE ${CURRENT_PACKAGES_DIR}/share/shiva-sfml/copyright "") diff --git a/ports/shiva/CONTROL b/ports/shiva/CONTROL index 1107466c79c..8f4df8b822e 100644 --- a/ports/shiva/CONTROL +++ b/ports/shiva/CONTROL @@ -1,4 +1,4 @@ Source: shiva -Version: 0.7 +Version: 0.7.2 Description: Modern C++ Game Engine Build-Depends: boost-stacktrace, boost-filesystem, boost-dll, entt, eastl, lua (windows), luafilesystem (windows), sol2, pybind11, spdlog diff --git a/ports/shiva/portfile.cmake b/ports/shiva/portfile.cmake index 565a2aa0927..e0156058d91 100644 --- a/ports/shiva/portfile.cmake +++ b/ports/shiva/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Milerius/shiva - REF 0.7 - SHA512 08591ce23ef717330c2fdc0518c383bebeda1a5eed93011b44280a409154729add70a0e913c2dae0d8332f4d6aee931ab8ba9957097435eadcff38e692e348ec + REF 0.7.2 + SHA512 0bd1543ba6067d303640820a17a24ec02c6ab8333f86bd3431c09f5a2ea4ca47379ec06a90e3a0658dba967504cb8a63f85c2f0cbfb51a7c59130b235948d600 HEAD_REF master )