Merge pull request #1 from Microsoft/master

pull

5 files changed, 173 insertions, 46 deletions

diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index afd6748af..3f1127ab0 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,3 +1,4 @@
 Source: boost
-Version: 1.61
+Version: 1.63-2
 Description: Peer-reviewed portable C++ source libraries
+Build-Depends: zlib, bzip2
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 89839d549..343e0c5b0 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -1,96 +1,202 @@
 include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/boost_1_63_0)
+
 vcpkg_download_distfile(ARCHIVE_FILE
-    URL "http://sourceforge.net/projects/boost/files/boost/1.61.0/boost_1_61_0.tar.bz2"
-    FILENAME "boost_1_61_0.tar.bz2"
-    SHA512 a1c7338e2d2dbac8552ede7c554640d22cbb2fda7fbc325dc3cdcb51e769713626695426ffc158cbe0e1729dd9a7b5ad18af4800d74e24539e8d8564268c2b9d
+    URLS "https://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.tar.bz2"
+    FILENAME "boost_1_63_0.tar.bz2"
+    SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
-if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/b2.exe)
+# apply boost range hotfix
+vcpkg_download_distfile(DIFF
+    URLS "https://github.com/boostorg/range/commit/e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff"
+    FILENAME "boost-range-has_range_iterator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff"
+    SHA512 77dad42bfd9bbab2bbddf361d5b7ad3dd6f812f4294c6dd1a677bb4d0191a4fff43bca32fdd4fce05d428562abb6e38afd0fd33ca6a8b5f28481d70cd2f3dd67
+)
+FILE(READ "${DIFF}" content)
+STRING(REGEX REPLACE "include/" "" content "${content}")
+set(DIFF2 ${CURRENT_BUILDTREES_DIR}/src/boost-range-has_range_iterator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff.fixed)
+FILE(WRITE ${DIFF2} "${content}")
+vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${DIFF2})
+
+if(NOT EXISTS ${SOURCE_PATH}/b2.exe)
     message(STATUS "Bootstrapping")
     vcpkg_execute_required_process(
-        COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/bootstrap.bat"
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0
+        COMMAND "${SOURCE_PATH}/bootstrap.bat"
+        WORKING_DIRECTORY ${SOURCE_PATH}
         LOGNAME bootstrap
     )
 endif()
 message(STATUS "Bootstrapping done")
 
 set(B2_OPTIONS
-    --toolset=msvc
+    -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
+    -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
     -j$ENV{NUMBER_OF_PROCESSORS}
+    --debug-configuration
+    --hash
     -q
+
     --without-python
     threading=multi
-    link=shared
-    runtime-link=shared
-    --debug-configuration
 )
+
+if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
+    list(APPEND B2_OPTIONS runtime-link=shared)
+else()
+    list(APPEND B2_OPTIONS runtime-link=static)
+endif()
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    list(APPEND B2_OPTIONS link=shared)
+else()
+    list(APPEND B2_OPTIONS link=static)
+endif()
+
 if(TRIPLET_SYSTEM_ARCH MATCHES "x64")
     list(APPEND B2_OPTIONS address-model=64)
 endif()
-if(TRIPLET_SYSTEM_NAME MATCHES "WindowsStore")
+
+if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    message(WARNING "Combination of VS2017 and UWP is partially supported; using reference Winmd's from VS2015")
+endif()
+if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
     list(APPEND B2_OPTIONS windows-api=store)
-    set(ENV{BOOST_BUILD_PATH} ${CMAKE_CURRENT_LIST_DIR})
+    set(ENV{BOOST_BUILD_PATH} ${CMAKE_CURRENT_LIST_DIR}/uwp)
+else()
+    set(ENV{BOOST_BUILD_PATH} ${CMAKE_CURRENT_LIST_DIR}/vs2017)
+endif()
+
+if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    list(APPEND B2_OPTIONS toolset=msvc-14.1)
+elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+    list(APPEND B2_OPTIONS toolset=msvc-14.0)
+else()
+    message(FATAL_ERROR "Unsupported value for VCPKG_PLATFORM_TOOLSET: '${VCPKG_PLATFORM_TOOLSET}'")
+endif()
+
+# Add build type specific options
+set(B2_OPTIONS_DBG
+    ${B2_OPTIONS}
+    -sZLIB_BINARY=zlibd
+    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
+    -sBZIP2_BINARY=bz2
+    -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
+)
+
+set(B2_OPTIONS_REL
+    ${B2_OPTIONS}
+    -sZLIB_BINARY=zlib
+    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
+    -sBZIP2_BINARY=bz2
+    -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
+)
+
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+    message(FATAL_ERROR "Unable to remove directory: ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\n  Files are likely in use.")
 endif()
 
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+    message(FATAL_ERROR "Unable to remove directory: ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\n  Files are likely in use.")
+endif()
 
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+if(EXISTS ${CURRENT_PACKAGES_DIR}/debug)
+    message(FATAL_ERROR "Error: directory exists: ${CURRENT_PACKAGES_DIR}/debug\n  The previous package was not fully cleared. This is an internal error.")
+endif()
 
 message(STATUS "Building ${TARGET_TRIPLET}-rel")
-vcpkg_execute_required_process(
-    COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/b2.exe"
+vcpkg_execute_required_process_repeat(
+    COUNT 2
+    COMMAND "${SOURCE_PATH}/b2.exe"
         --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage
         --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        ${B2_OPTIONS}
+        ${B2_OPTIONS_REL}
         variant=release
-    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0
+        debug-symbols=on
+    WORKING_DIRECTORY ${SOURCE_PATH}
     LOGNAME build-${TARGET_TRIPLET}-rel
 )
 message(STATUS "Building ${TARGET_TRIPLET}-rel done")
 message(STATUS "Building ${TARGET_TRIPLET}-dbg")
-vcpkg_execute_required_process(
-    COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/b2.exe"
+vcpkg_execute_required_process_repeat(
+    COUNT 2
+    COMMAND "${SOURCE_PATH}/b2.exe"
         --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage
         --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        ${B2_OPTIONS}
+        ${B2_OPTIONS_DBG}
         variant=debug
-    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0
+    WORKING_DIRECTORY ${SOURCE_PATH}
     LOGNAME build-${TARGET_TRIPLET}-dbg
 )
 message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
 
 message(STATUS "Packaging headers")
 file(
-    COPY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/boost
+    COPY ${SOURCE_PATH}/boost
     DESTINATION ${CURRENT_PACKAGES_DIR}/include
-    PATTERN "config/user.hpp" EXCLUDE
-)
-file(COPY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/boost/config/user.hpp
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include/boost/config/
 )
+
+# Disable Boost auto-link.
 file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
-    "\n#define BOOST_ALL_DYN_LINK\n"
+	"\n#define BOOST_ALL_NO_LIB\n"
 )
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright)
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
+        "\n#define BOOST_ALL_DYN_LINK\n"
+    )
+endif()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright)
 message(STATUS "Packaging headers done")
 
+# This function makes the static build lib names match the dynamic build lib names which FindBoost.cmake is looking for by default.
+# It also renames a couple of "libboost" lib files in the dynamic build (for example libboost_exception-vc140-mt-1_63.lib).
+function(boost_rename_libs LIBS)
+    foreach(LIB ${${LIBS}})
+        get_filename_component(OLD_FILENAME ${LIB} NAME)
+        get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
+        string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
+        string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs
+        string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries
+        string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
+        if ("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
+            # nothing to do
+        elseif (EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
+            file(REMOVE ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME})
+        else()
+            file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
+        endif()
+    endforeach()
+endfunction()
+
 message(STATUS "Packaging ${TARGET_TRIPLET}-rel")
 file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/
     DESTINATION ${CURRENT_PACKAGES_DIR}/lib
     FILES_MATCHING PATTERN "*.lib")
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/
-    DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-    FILES_MATCHING PATTERN "*.dll")
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/
+        DESTINATION ${CURRENT_PACKAGES_DIR}/bin
+        FILES_MATCHING PATTERN "*.dll")
+endif()
+file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/*.lib)
+boost_rename_libs(RELEASE_LIBS)
 message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
 
 message(STATUS "Packaging ${TARGET_TRIPLET}-dbg")
 file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/
     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
     FILES_MATCHING PATTERN "*.lib")
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-    FILES_MATCHING PATTERN "*.dll")
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/
+        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
+        FILES_MATCHING PATTERN "*.dll")
+endif()
+file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*.lib)
+boost_rename_libs(DEBUG_LIBS)
 message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done")
 
-vcpkg_copy_pdbs()
\ No newline at end of file
+vcpkg_copy_pdbs()
diff --git a/ports/boost/user-config.jam b/ports/boost/user-config.jam
deleted file mode 100644
index 58184920a..000000000
--- a/ports/boost/user-config.jam
+++ /dev/null
@@ -1,10 +0,0 @@
-using msvc : 14.0 : :
-<compileflags>"\"/AIC:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\LIB\\store\\references\""
-<linkflags>/appcontainer
-<linkflags>/nodefaultlibs
-<linkflags>WindowsApp.lib
-<variant>release:<linkflags>vcruntime.lib
-<variant>debug:<linkflags>vcruntimed.lib
-<variant>release:<linkflags>ucrt.lib
-<variant>debug:<linkflags>ucrtd.lib
-;
diff --git a/ports/boost/uwp/user-config.jam b/ports/boost/uwp/user-config.jam
new file mode 100644
index 000000000..9dbbb352f
--- /dev/null
+++ b/ports/boost/uwp/user-config.jam
@@ -0,0 +1,23 @@
+using msvc : 14.0 : :
+<setup>echo
+<compileflags>"\"/AIC:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\LIB\\store\\references\""
+<linkflags>/appcontainer
+<linkflags>/nodefaultlibs
+<linkflags>WindowsApp.lib
+<variant>release:<linkflags>vcruntime.lib
+<variant>debug:<linkflags>vcruntimed.lib
+<variant>release:<linkflags>ucrt.lib
+<variant>debug:<linkflags>ucrtd.lib
+;
+
+using msvc : 14.1 : cl.exe :
+<setup>echo
+<compileflags>"\"/AIC:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\LIB\\store\\references\""
+<linkflags>/appcontainer
+<linkflags>/nodefaultlibs
+<linkflags>WindowsApp.lib
+<variant>release:<linkflags>vcruntime.lib
+<variant>debug:<linkflags>vcruntimed.lib
+<variant>release:<linkflags>ucrt.lib
+<variant>debug:<linkflags>ucrtd.lib
+;
diff --git a/ports/boost/vs2017/user-config.jam b/ports/boost/vs2017/user-config.jam
new file mode 100644
index 000000000..8faba6d72
--- /dev/null
+++ b/ports/boost/vs2017/user-config.jam
@@ -0,0 +1,7 @@
+using msvc : 14.0 : cl.exe :
+<setup>echo
+;
+
+using msvc : 14.1 : cl.exe :
+<setup>echo
+;