[corrade][magnum-plugins][magnum] Use vcpkg_from_github()

6 files changed, 43 insertions, 56 deletions

diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL
index 487766e89..748d0c61a 100644
--- a/ports/corrade/CONTROL
+++ b/ports/corrade/CONTROL
@@ -1,3 +1,3 @@
 Source: corrade
-Version: jun2017
+Version: jun2017-1
 Description: C++11/C++14 multiplatform utility library http://mosra.cz/blog/corrade.php
diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake
index 76979496b..113d24dc7 100644
--- a/ports/corrade/portfile.cmake
+++ b/ports/corrade/portfile.cmake
@@ -1,17 +1,11 @@
-#
-
-set(CORRADE_HASH b87c50db3543367b6eb20dc72246c6687449b029)
-
 include(vcpkg_common_functions)
-
-
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/corrade-${CORRADE_HASH})
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/mosra/corrade/archive/${CORRADE_HASH}.zip"
-    FILENAME "corrade-${CORRADE_HASH}.zip"
-    SHA512 b15b544f996b8c95fbdf73ff9b76deea465fdcf06f431b09f4bbb9a786f4e864fdb4f8c5a2977cb366ee2398c54eac4c469da29c2ab7c67d3b8f7cbf7d2120dc
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mosra/corrade
+    REF b87c50db3543367b6eb20dc72246c6687449b029
+    SHA512 882ccba210c6db7dc8a70e425e1cc119dd1c1a880b8b7d36b2c9478a2105294294680495e7bafb8c0bc7f667bd247dbd008e8ff133a8ea26b13df781a8896297
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(BUILD_STATIC 1)
@@ -31,11 +25,10 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Drop a copy of tools
-file(COPY ${CURRENT_PACKAGES_DIR}/bin/corrade-rc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/)
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/corrade-rc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/corrade)
+
 # Tools require dlls
-file(GLOB TO_COPY
-   ${CURRENT_PACKAGES_DIR}/bin/*.dll)
-file(COPY ${TO_COPY} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/corrade)
 
 file(GLOB_RECURSE TO_REMOVE 
    ${CURRENT_PACKAGES_DIR}/bin/*.exe
diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL
index 0aec0062d..1bf1111c4 100644
--- a/ports/magnum-plugins/CONTROL
+++ b/ports/magnum-plugins/CONTROL
@@ -1,4 +1,4 @@
 Source: magnum-plugins
-Version: jun2017
+Version: jun2017-1
 Build-Depends: stb, magnum
 Description: Plugins for C++11/C++14 and OpenGL graphics engine http://mosra.cz/blog/magnum.php
diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake
index fae2b08e7..199789c99 100644
--- a/ports/magnum-plugins/portfile.cmake
+++ b/ports/magnum-plugins/portfile.cmake
@@ -1,15 +1,11 @@
-###
-
-set(MAGNUM_PLUGINS_HASH 645b50647d5164c5ec8f5bc83ba2578f6cfe7d80)
-
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/magnum-plugins-${MAGNUM_PLUGINS_HASH})
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/mosra/magnum-plugins/archive/${MAGNUM_PLUGINS_HASH}.zip"
-    FILENAME "magnum-plugins-${MAGNUM_PLUGINS_HASH}.zip"
-    SHA512 5ab603f50cee325113e3f1ccd67d294d32f7386334136304ad8135ac8ff0218cbd2834197c7db85bb5fd11c69e28d00217fa5d9dbdad71a83e372722a6f8bda0
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mosra/magnum-plugins
+    REF 645b50647d5164c5ec8f5bc83ba2578f6cfe7d80
+    SHA512 73c7fb7e9a5a9e2a4ee7314b5d41d98ada9cf1a50c1cd833c2ae19c5bdab66862f3696f142e987f9d2b551142e94f96a2d8ccad37625682c8391400091dcf879
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(BUILD_STATIC 1)
@@ -20,19 +16,20 @@ endif()
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA # Disable this option if project cannot be built with Ninja
-    OPTIONS -DWITH_STBIMAGECONVERTER=ON
-    OPTIONS -DWITH_STBIMAGEIMPORTER=ON
-    OPTIONS -DWITH_STBTRUETYPEFONT=ON
-    OPTIONS -DWITH_STBTRUETYPEFONT=ON
-    OPTIONS -DWITH_MINIEXRIMAGECONVERTER=ON
-    OPTIONS -DWITH_OPENGEXIMPORTER=ON
-    OPTIONS -DWITH_OPENGEXIMPORTER=ON
-    OPTIONS -DWITH_STANFORDIMPORTER=ON
-    OPTIONS -DWITH_DRWAVAUDIOIMPORTER=ON
-    OPTIONS -DWITH_ANYAUDIOIMPORTER=ON
-    OPTIONS -DWITH_ANYIMAGECONVERTER=ON
-    OPTIONS -DWITH_ANYSCENEIMPORTER=ON
-    OPTIONS -DBUILD_STATIC=${BUILD_STATIC}
+    OPTIONS
+        -DWITH_STBIMAGECONVERTER=ON
+        -DWITH_STBIMAGEIMPORTER=ON
+        -DWITH_STBTRUETYPEFONT=ON
+        -DWITH_STBTRUETYPEFONT=ON
+        -DWITH_MINIEXRIMAGECONVERTER=ON
+        -DWITH_OPENGEXIMPORTER=ON
+        -DWITH_OPENGEXIMPORTER=ON
+        -DWITH_STANFORDIMPORTER=ON
+        -DWITH_DRWAVAUDIOIMPORTER=ON
+        -DWITH_ANYAUDIOIMPORTER=ON
+        -DWITH_ANYIMAGECONVERTER=ON
+        -DWITH_ANYSCENEIMPORTER=ON
+        -DBUILD_STATIC=${BUILD_STATIC}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
index f934ba0a6..a110136f2 100644
--- a/ports/magnum/CONTROL
+++ b/ports/magnum/CONTROL
@@ -1,4 +1,4 @@
 Source: magnum
-Version: jun2017
+Version: jun2017-1
 Build-Depends: corrade, sdl2, openal-soft
 Description: C++11/C++14 and OpenGL graphics engine http://mosra.cz/blog/magnum.php
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
index dd934b31d..67d1f825a 100644
--- a/ports/magnum/portfile.cmake
+++ b/ports/magnum/portfile.cmake
@@ -1,15 +1,11 @@
-###
-
-set(MAGNUM_HASH c8416ca4c3e9b68ba62acc9f73de235526cb3d6e)
-
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/magnum-${MAGNUM_HASH})
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/mosra/magnum/archive/${MAGNUM_HASH}.zip"
-    FILENAME "magnum-${MAGNUM_HASH}.zip"
-    SHA512 1248efaba22568a753396192624690a478c69946cdbbffe83e34cb85d54ec65756b693e025bf477fc192e6fecce56dc1b68631e1a763986267b83d6530af6ef4
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mosra/magnum
+    REF c8416ca4c3e9b68ba62acc9f73de235526cb3d6e
+    SHA512 d595be48ae44d944d5747880e0108bdc445b92fcc306f0169699e2b80500919647063ac88ef67491b2d8e92ae1f0612cd8768fc63d8cc4ffe4c625988b63504d
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(BUILD_STATIC 1)
@@ -20,10 +16,11 @@ endif()
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA # Disable this option if project cannot be built with Ninja
-    OPTIONS -DWITH_SDL2APPLICATION=ON
-    OPTIONS -DWITH_AUDIO=ON
-    OPTIONS -DWITH_WAVAUDIOIMPORTER=ON
-    OPTIONS -DBUILD_STATIC=${BUILD_STATIC}
+    OPTIONS
+        -DWITH_SDL2APPLICATION=ON
+        -DWITH_AUDIO=ON
+        -DWITH_WAVAUDIOIMPORTER=ON
+        -DBUILD_STATIC=${BUILD_STATIC}
 )
 
 vcpkg_install_cmake()