Merge pull request #2432 from RT222/master

[directxmesh] [directxtex] [directxtk] [bullet3] Update to the last version

8 files changed, 100 insertions, 60 deletions

diff --git a/ports/bullet3/CONTROL b/ports/bullet3/CONTROL
index 92b55db2e..36f8b1838 100644
--- a/ports/bullet3/CONTROL
+++ b/ports/bullet3/CONTROL
@@ -1,3 +1,3 @@
 Source: bullet3
-Version: 2.86.1-1
+Version: 2.87
 Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library
diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake
index 17d6f8ea7..f86f323f3 100644
--- a/ports/bullet3/portfile.cmake
+++ b/ports/bullet3/portfile.cmake
@@ -1,11 +1,23 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bullet3-2.86.1)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/bulletphysics/bullet3/archive/2.86.1.zip"
-    FILENAME "bullet3-2.86.1.zip"
-    SHA512 96c67bed63db4b7d46196cebda57b80543ea37bd19f013adcfe19ee6c2c3319ed007bcd1ebbe345d8c75b7e80588f4a7d85cb6a07e1a5eea759d97ce4d94f972
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO bulletphysics/bullet3
+    REF 2.87
+    SHA512 649e470223295666eda6f7ff59d03097637c2645b5cd951977060ae14b89f56948ce03e437e83c986d26876f187d7ee34e790bc3882d5d66da9af89a4ab81c21
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -22,14 +34,14 @@ vcpkg_configure_cmake(
         -DINSTALL_LIBS=ON
 )
 
-vcpkg_build_cmake()
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bullet3)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/bullet3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/bullet3/copyright)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamics/details)
 
 vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bullet3 RENAME copyright)
\ No newline at end of file
diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL
index 13401f80d..0348b1939 100644
--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@@ -1,3 +1,3 @@
 Source: directxmesh

-Version: oct2016

+Version: dec2017

 Description: DirectXMesh geometry processing library
\ No newline at end of file
diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake
index 51840b68f..26fda2210 100644
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@@ -1,10 +1,16 @@
 # Common Ambient Variables:

-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>

-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)

-#   PORT is the current port name (zlib, etc)

-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}

-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}

+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}

+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}

+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}

+#   PORT                      = current port name (zlib, etc)

+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)

+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)

+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)

+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>

+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)

 #

+include(vcpkg_common_functions)

+

 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

     message(STATUS "Warning: Dynamic building not supported yet. Building static.")

     set(VCPKG_LIBRARY_LINKAGE static)

@@ -14,14 +20,15 @@ if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
   message(FATAL_ERROR "DirectXMesh only supports dynamic CRT linkage")

 endif()

 

-include(vcpkg_common_functions)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXMesh-oct2016)

-vcpkg_download_distfile(ARCHIVE

-    URLS "https://github.com/Microsoft/DirectXMesh/archive/oct2016.tar.gz"

-    FILENAME "DirectXMesh-oct2016.tar.gz"

-    SHA512 8aaf9749766afd23709ce6c6f8d74b008fe9f96789e4d97cb387633dad34b4132ef28dfe028d13c779ea366428d53076a881c0d63c4f0c2c74d552293c8d6bf1

+set(DIRECTXMESH_VERSION dec2017)

+set(DIRECTXMESH_ARCHIVE_HASH 82468f1fcf0d51cf614921b1bd2dd06a05b120f84531d59429042951a39d1e978b5395cdf75269fe1767789ce487bfc6e544c54df4b1b9bec9adb1c853dc8497)

+vcpkg_from_github(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO Microsoft/DirectXMesh

+    REF ${DIRECTXMESH_VERSION}

+    SHA512 ${DIRECTXMESH_ARCHIVE_HASH}

+    HEAD_REF master

 )

-vcpkg_extract_source_archive(${ARCHIVE})

 

 IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")

     SET(BUILD_ARCH "Win32")

@@ -30,7 +37,7 @@ ELSE()
 ENDIF()

 

 vcpkg_build_msbuild(

-    PROJECT_PATH ${SOURCE_PATH}/DirectXMesh_Desktop_2015.sln

+    PROJECT_PATH ${SOURCE_PATH}/DirectXMesh_Desktop_2017.sln

     PLATFORM ${BUILD_ARCH}

 )

 

@@ -40,15 +47,15 @@ file(INSTALL
     DESTINATION ${CURRENT_PACKAGES_DIR}/include

 )

 file(INSTALL

-    ${SOURCE_PATH}/DirectXMesh/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DirectXMesh.lib

+    ${SOURCE_PATH}/DirectXMesh/Bin/Desktop_2017/${BUILD_ARCH}/Debug/DirectXMesh.lib

     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

 file(INSTALL

-    ${SOURCE_PATH}/DirectXMesh/Bin/Desktop_2015/${BUILD_ARCH}/Release/DirectXMesh.lib

+    ${SOURCE_PATH}/DirectXMesh/Bin/Desktop_2017/${BUILD_ARCH}/Release/DirectXMesh.lib

     DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

 

 set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools)

 file(INSTALL

-    ${SOURCE_PATH}/Meshconvert/Bin/Desktop_2015/${BUILD_ARCH}/Release/Meshconvert.exe

+    ${SOURCE_PATH}/Meshconvert/Bin/Desktop_2017/${BUILD_ARCH}/Release/Meshconvert.exe

     DESTINATION ${TOOL_PATH})

 

 # Handle copyright

diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL
index b11daa8d4..57de4eea1 100644
--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@@ -1,3 +1,3 @@
 Source: directxtex

-Version: dec2016

+Version: dec2017

 Description: DirectXTex texture processing library
\ No newline at end of file
diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
index 392290c06..c1127fea7 100644
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@@ -1,10 +1,16 @@
 # Common Ambient Variables:

-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>

-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)

-#   PORT is the current port name (zlib, etc)

-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}

-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}

+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}

+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}

+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}

+#   PORT                      = current port name (zlib, etc)

+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)

+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)

+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)

+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>

+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)

 #

+include(vcpkg_common_functions)

+

 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

     message(STATUS "Warning: Dynamic building not supported yet. Building static.")

     set(VCPKG_LIBRARY_LINKAGE static)

@@ -14,14 +20,15 @@ if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
   message(FATAL_ERROR "DirectXTex only supports dynamic CRT linkage")

 endif()

 

-include(vcpkg_common_functions)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/directxtex-dec2016)

-vcpkg_download_distfile(ARCHIVE

-    URLS "https://github.com/Microsoft/DirectXTex/archive/dec2016.tar.gz"

-    FILENAME "directxtex-dec2016.tar.gz"

-    SHA512 87797340c40a98a7b11b6eb7da17d0b93bc01ba48deed50e99ce74e0e33387cac2ec18f2f14d0148c2a79f97ca98d6b2a228dad2f16010b6dcf03c0d24a79d20

+set(DIRECTXTEX_VERSION dec2017)

+set(DIRECTXTEX_ARCHIVE_HASH f4154c820059893ce0a42a1224d14adc0f8b54f36aa7f687f29aba0358488da9eb83cbdbf682499c5b210e99607d74209595153d4ed86eb30c43b775c5d8a72f)

+vcpkg_from_github(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO Microsoft/DirectXTex

+    REF ${DIRECTXTEX_VERSION}

+    SHA512 ${DIRECTXTEX_ARCHIVE_HASH}

+    HEAD_REF master

 )

-vcpkg_extract_source_archive(${ARCHIVE})

 

 IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")

     SET(BUILD_ARCH "Win32")

@@ -30,7 +37,7 @@ ELSE()
 ENDIF()

 

 vcpkg_build_msbuild(

-    PROJECT_PATH ${SOURCE_PATH}/DirectXTex_Desktop_2015.sln

+    PROJECT_PATH ${SOURCE_PATH}/DirectXTex_Desktop_2017.sln

     PLATFORM ${BUILD_ARCH}

 )

 

@@ -40,22 +47,22 @@ file(INSTALL
     DESTINATION ${CURRENT_PACKAGES_DIR}/include

 )

 file(INSTALL

-    ${SOURCE_PATH}/DirectXTex/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DirectXTex.lib

+    ${SOURCE_PATH}/DirectXTex/Bin/Desktop_2017/${BUILD_ARCH}/Debug/DirectXTex.lib

     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

 file(INSTALL

-    ${SOURCE_PATH}/DirectXTex/Bin/Desktop_2015/${BUILD_ARCH}/Release/DirectXTex.lib

+    ${SOURCE_PATH}/DirectXTex/Bin/Desktop_2017/${BUILD_ARCH}/Release/DirectXTex.lib

     DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

 

 set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools)

 file(MAKE_DIRECTORY ${TOOL_PATH})

 file(INSTALL

-    ${SOURCE_PATH}/Texdiag/Bin/Desktop_2015/${BUILD_ARCH}/Release/texdiag.exe

+    ${SOURCE_PATH}/Texdiag/Bin/Desktop_2017/${BUILD_ARCH}/Release/texdiag.exe

     DESTINATION ${TOOL_PATH})

 file(INSTALL

-    ${SOURCE_PATH}/Texconv/Bin/Desktop_2015/${BUILD_ARCH}/Release/Texconv.exe

+    ${SOURCE_PATH}/Texconv/Bin/Desktop_2017/${BUILD_ARCH}/Release/Texconv.exe

     DESTINATION ${TOOL_PATH})

 file(INSTALL

-    ${SOURCE_PATH}/Texassemble/Bin/Desktop_2015/${BUILD_ARCH}/Release/Texassemble.exe

+    ${SOURCE_PATH}/Texassemble/Bin/Desktop_2017/${BUILD_ARCH}/Release/Texassemble.exe

     DESTINATION ${TOOL_PATH})

 

 # Handle copyright

diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL
index 97f97ecd9..4e565f799 100644
--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@@ -1,3 +1,3 @@
 Source: directxtk
-Version: dec2016-1
+Version: dec2017
 Description: A collection of helper classes for writing DirectX 11.x code in C++.
diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake
index 5a751446c..31fa82011 100644
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@@ -1,20 +1,34 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+include(vcpkg_common_functions)
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     message(STATUS "Warning: Dynamic building not supported yet. Building static.")
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
 
 if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-  message(FATAL_ERROR "DirectXTk only supports dynamic CRT linkage")
+  message(FATAL_ERROR "DirectXTK only supports dynamic CRT linkage")
 endif()
 
-include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXTK-dec2016)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Microsoft/DirectXTK/archive/dec2016.tar.gz"
-    FILENAME "DirectXTK-dec2016.tar.gz"
-    SHA512 efb8a98d0872bf1835b274ba88615e88c4a58ab753c5ebef5a407c54d5f9a2197d1521f14651c60ea16c047918db6f54bf2ac58a6eb7330490b9bae619e8dad3
+set(DIRECTXTK_VERSION dec2017)
+set(DIRECTXTK_ARCHIVE_HASH 30df95c17d6d61bdeb372d3ba112995ad76753e23ddaf7fb104d2384e3b26e22a383355d2a411fdfce866d4a98205e4ed039a8f34a9e1d9bc1ee90b4064bcd15)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/DirectXTK
+    REF ${DIRECTXTK_VERSION}
+    SHA512 ${DIRECTXTK_ARCHIVE_HASH}
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
 	SET(BUILD_ARCH "Win32")
@@ -23,16 +37,16 @@ ELSE()
 ENDIF()
 
 vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/DirectXTK_Desktop_2015.sln
+    PROJECT_PATH ${SOURCE_PATH}/DirectXTK_Desktop_2017.sln
 	PLATFORM ${BUILD_ARCH}
 )
 
 file(INSTALL
-	${SOURCE_PATH}/Bin/Desktop_2015/${BUILD_ARCH}/Release/DirectXTK.lib
+	${SOURCE_PATH}/Bin/Desktop_2017/${BUILD_ARCH}/Release/DirectXTK.lib
 	DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 
 file(INSTALL
-	${SOURCE_PATH}/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DirectXTK.lib
+	${SOURCE_PATH}/Bin/Desktop_2017/${BUILD_ARCH}/Debug/DirectXTK.lib
 	DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
 
 set(DXTK_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxtk)
@@ -43,7 +57,7 @@ file(INSTALL
 	DESTINATION ${DXTK_TOOL_PATH})
 
 file(INSTALL
-	${SOURCE_PATH}/XWBTool/Bin/Desktop_2015/${BUILD_ARCH}/Release/XWBTool.exe 
+	${SOURCE_PATH}/XWBTool/Bin/Desktop_2017/${BUILD_ARCH}/Release/XWBTool.exe 
 	DESTINATION ${DXTK_TOOL_PATH})
 
 file(INSTALL