Merge branch 'master' of https://github.com/Microsoft/vcpkg

8 files changed, 59 insertions, 88 deletions

diff --git a/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch b/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch
index 33b0b920f..eeecbc1f7 100644
--- a/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch
+++ b/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch
@@ -1,29 +1,17 @@
-From 59ebd2985f081229edc3c487367a1e5d5ac8db9a Mon Sep 17 00:00:00 2001
-From: Robert Schumacher <roschuma@microsoft.com>
-Date: Mon, 10 Oct 2016 23:00:38 -0700
-Subject: [PATCH] Add CONFIG_INSTALL_PATH option
-
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 774737d..5de689c 100644
+index 6bb2558..a894ada 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -401,8 +401,11 @@ install(TARGETS freetype
-   ARCHIVE DESTINATION lib
-   FRAMEWORK DESTINATION Library/Frameworks
- )
+@@ -419,8 +419,11 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
+     ARCHIVE DESTINATION lib
+     FRAMEWORK DESTINATION Library/Frameworks
+     )
 +
-+set(CONFIG_INSTALL_PATH "lib/cmake/freetype" CACHE STRING "location to install cmake config files")
++  set(CONFIG_INSTALL_PATH "lib/cmake/freetype" CACHE STRING "location to install cmake config files")
 +
- install(EXPORT freetype-targets
--  DESTINATION lib/cmake/freetype
-+  DESTINATION ${CONFIG_INSTALL_PATH}
-   FILE freetype-config.cmake
- )
- 
--- 
-2.9.2.windows.1
-
+   install(EXPORT freetype-targets
+-    DESTINATION lib/cmake/freetype
++    DESTINATION ${CONFIG_INSTALL_PATH}
+     FILE freetype-config.cmake
+     )
+ endif ()
diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL
index 3afd18c9d..541f8b024 100644
--- a/ports/freetype/CONTROL
+++ b/ports/freetype/CONTROL
@@ -1,4 +1,4 @@
 Source: freetype
-Version: 2.6.3-5
+Version: 2.8
 Build-Depends: zlib, bzip2, libpng
 Description: A library to render fonts.
\ No newline at end of file
diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake
index b5c20a610..8bce2577e 100644
--- a/ports/freetype/portfile.cmake
+++ b/ports/freetype/portfile.cmake
@@ -1,9 +1,10 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freetype-2.6.3)
+set(FT_VERSION 2.8)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freetype-${FT_VERSION})
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.savannah.gnu.org/releases/freetype/freetype-2.6.3.tar.bz2"
-    FILENAME "freetype-2.6.3.tar.bz2"
-    SHA512 e1f9018835fc88beeb4479537b59f866c52393ae18d24a1e0710a464cf948ab02b35c2c6043bc20c1db3a04871ee4eb0bb1d210550c0ea2780c8b1aea98fbf0d
+    URLS "http://download.savannah.gnu.org/releases/freetype/freetype-${FT_VERSION}.tar.bz2"
+    FILENAME "freetype-${FT_VERSION}.tar.bz2"
+    SHA512 3842c34bf6100a8c9b78258146b2ff35e9bb4c993937d3ef09982c1e2552dfd15f8849ddd8a1e84edf08b5a5fb918b68cf7b1584545c5900e22a00bfa1c89ff5
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
@@ -16,6 +17,7 @@ vcpkg_apply_patches(
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS
         -DCONFIG_INSTALL_PATH=share/freetype
         -DWITH_ZLIB=ON
diff --git a/ports/sqlite3/CONTROL b/ports/sqlite3/CONTROL
index f1d9bde16..d833f02b9 100644
--- a/ports/sqlite3/CONTROL
+++ b/ports/sqlite3/CONTROL
@@ -1,3 +1,3 @@
 Source: sqlite3

-Version: 3.18.0-1

+Version: 3.19.1-1

 Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.
\ No newline at end of file
diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake
index 1b906fba5..768cd83a6 100644
--- a/ports/sqlite3/portfile.cmake
+++ b/ports/sqlite3/portfile.cmake
@@ -1,7 +1,7 @@
 include(vcpkg_common_functions)

 

-set(SQLITE_VERSION 3180000)

-set(SQLITE_HASH d390c1d83afc27ec184ea6ab392477647cc80eb97ca177797cd494409c5646435c7a84502cc74ded1b654af13e65d2eef444bb0255a127e59d2cf40d5d0c1192)

+set(SQLITE_VERSION 3190100)

+set(SQLITE_HASH 14064707d9ca029131ec92863026748e184ad4d6ca9d25e941fc254d9ad24f1451fc5fae6516603a420925aab1736e3fb92085f03d8dc47ec913839e158652c4)

 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/sqlite-amalgamation-${SQLITE_VERSION})

 

 vcpkg_download_distfile(ARCHIVE

diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL
index b82b70555..9dc9198f8 100644
--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@@ -1,3 +1,3 @@
 Source: tbb
-Version: 20160916
+Version: 2017_U6
 Description: Intel's Threading Building Blocks.
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index fc761f113..a733be711 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -1,24 +1,26 @@
-# 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}
-#
-
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     message(STATUS "Warning: Static building not supported yet. Building dynamic.")
     set(VCPKG_LIBRARY_LINKAGE dynamic)
 endif()
+if (VCPKG_CRT_LINKAGE STREQUAL static OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+    message(FATAL_ERROR "Build settings not supported")
+endif()
+
 include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO 01org/tbb
+    REF 2017_U6
+    SHA512 76b49fd085d8407b68b0f17e6eebfbcb7d2e6f9116bb5f6a00c6b4d59a55b16f9de79a2b9c9c3ece497b01810c33df21d0657893fd886db8bed639091ba97060
+    HEAD_REF tbb_2017)
+
+if(TRIPLET_SYSTEM_ARCH STREQUAL x86)
+	set(BUILD_ARCH Win32)
+else()
+	set(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
+endif()
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tbb2017_20160916oss)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/windows/tbb2017_20160916oss_win_1.zip"
-    FILENAME "tbb2017_20160916oss_win_1.zip"
-    SHA512 14bbc54aa0c4506bab6e6fdb7e9e562cbc88881cb683a8bd690e3101177e55433f25a2143e7af1ed52edacb44dc92fab354e1f2101bc13b33b3ea137def8bdd1
-)
-vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_build_msbuild(PROJECT_PATH ${SOURCE_PATH}/build/vs2012/makefile.sln PLATFORM ${BUILD_ARCH})
 
 # Installation
 message(STATUS "Installing")
@@ -27,54 +29,33 @@ file(COPY
   ${SOURCE_PATH}/include/serial
   DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-  set(BIN_PATH ${SOURCE_PATH}/bin/intel64/vc14)
-  set(LIB_PATH ${SOURCE_PATH}/lib/intel64/vc14)
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-  set(BIN_PATH ${SOURCE_PATH}/bin/ia32/vc14)
-  set(LIB_PATH ${SOURCE_PATH}/lib/ia32/vc14)
-else()
-  message(FATAL_ERROR "Unsupported architecture")
-endif()
+set(DEBUG_OUTPUT_PATH ${SOURCE_PATH}/build/vs2012/${BUILD_ARCH}/Debug)
+set(RELEASE_OUTPUT_PATH ${SOURCE_PATH}/build/vs2012/${BUILD_ARCH}/Release)
 
 file(COPY
-  ${LIB_PATH}/tbb.lib
-  ${LIB_PATH}/tbb_preview.lib
-  ${LIB_PATH}/tbbmalloc.lib
-  ${LIB_PATH}/tbbmalloc_proxy.lib
-  ${LIB_PATH}/tbbproxy.lib
-  ${LIB_PATH}/tbbproxy.pdb
+  ${RELEASE_OUTPUT_PATH}/tbb.lib
+  ${RELEASE_OUTPUT_PATH}/tbbmalloc.lib
+  ${RELEASE_OUTPUT_PATH}/tbbmalloc_proxy.lib
   DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 file(COPY
-  ${LIB_PATH}/tbb_debug.lib
-  ${LIB_PATH}/tbb_preview_debug.lib
-  ${LIB_PATH}/tbbmalloc_debug.lib
-  ${LIB_PATH}/tbbmalloc_proxy_debug.lib
-  ${LIB_PATH}/tbbproxy_debug.lib
-  ${LIB_PATH}/tbbproxy_debug.pdb
+  ${DEBUG_OUTPUT_PATH}/tbb_debug.lib
+  ${DEBUG_OUTPUT_PATH}/tbbmalloc_debug.lib
+  ${DEBUG_OUTPUT_PATH}/tbbmalloc_proxy_debug.lib
   DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
 
 file(COPY
-  ${BIN_PATH}/tbb.dll
-  ${BIN_PATH}/tbb_preview.dll
-  ${BIN_PATH}/tbbmalloc.dll
-  ${BIN_PATH}/tbbmalloc_proxy.dll
-  ${BIN_PATH}/tbb.pdb
-  ${BIN_PATH}/tbb_preview.pdb
-  ${BIN_PATH}/tbbmalloc.pdb
-  ${BIN_PATH}/tbbmalloc_proxy.pdb
+  ${RELEASE_OUTPUT_PATH}/tbb.dll
+  ${RELEASE_OUTPUT_PATH}/tbbmalloc.dll
+  ${RELEASE_OUTPUT_PATH}/tbbmalloc_proxy.dll
   DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
 file(COPY
-  ${BIN_PATH}/tbb_debug.dll
-  ${BIN_PATH}/tbb_preview_debug.dll
-  ${BIN_PATH}/tbbmalloc_debug.dll
-  ${BIN_PATH}/tbbmalloc_proxy_debug.dll
-  ${BIN_PATH}/tbb_debug.pdb
-  ${BIN_PATH}/tbb_preview_debug.pdb
-  ${BIN_PATH}/tbbmalloc_debug.pdb
-  ${BIN_PATH}/tbbmalloc_proxy_debug.pdb
+  ${DEBUG_OUTPUT_PATH}/tbb_debug.dll
+  ${DEBUG_OUTPUT_PATH}/tbbmalloc_debug.dll
+  ${DEBUG_OUTPUT_PATH}/tbbmalloc_proxy_debug.dll
   DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
 
+vcpkg_copy_pdbs()
+
 message(STATUS "Installing done")
 
 # Handle copyright
diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index 6c2e85b60..b6144d581 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -9,7 +9,7 @@ $downloadPromptOverride_NO_OVERRIDE= 0
 $downloadPromptOverride_DO_NOT_PROMPT = 1
 $downloadPromptOverride_ALWAYS_PROMPT = 2
 
-if ($PSVersionTable.PSEdition -eq "Desktop") {
+if ($PSVersionTable.PSEdition -ne "Core") {
    Import-Module BitsTransfer -Verbose:$false
 }
 
@@ -82,7 +82,7 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
             New-Item -ItemType directory -Path $downloadDir | Out-Null
         }
 
-        if (($PSVersionTable.PSEdition -eq "Desktop") -and ($Dependency -ne "git")) # git fails with BITS
+        if (($PSVersionTable.PSEdition -ne "Core") -and ($Dependency -ne "git")) # git fails with BITS
         {
             try {
                 $WC = New-Object System.Net.WebClient
@@ -197,7 +197,7 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
     performDownload $Dependency $url $downloadsDir $downloadPath $downloadVersion $requiredVersion
 
     #calculating the hash
-    if ($PSVersionTable.PSEdition -eq "Desktop")
+    if ($PSVersionTable.PSEdition -ne "Core")
     {
         $hashAlgorithm = [Security.Cryptography.HashAlgorithm]::Create("SHA256")
         $fileAsByteArray = [io.File]::ReadAllBytes($downloadPath)