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

10 files changed, 71 insertions, 8 deletions

diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL
new file mode 100644
index 000000000..eed3c518d
--- /dev/null
+++ b/ports/apr/CONTROL
@@ -0,0 +1,3 @@
+Source: apr
+Version: 1.5.2
+Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
new file mode 100644
index 000000000..df96d4474
--- /dev/null
+++ b/ports/apr/portfile.cmake
@@ -0,0 +1,50 @@
+# 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}
+#
+
+include(${CMAKE_TRIPLET_FILE})
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-1.5.2)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.apache.org/dist/apr/apr-1.5.2.tar.bz2"
+    FILENAME "apr-1.5.2.tar.bz2"
+    SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON
+    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
+    # OPTIONS_RELEASE -DOPTIMIZE=1
+    # OPTIONS_DEBUG -DDEBUGGABLE=1
+)
+
+vcpkg_install_cmake()
+
+# There is no way to suppress installation of the headers in debug builds.
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Both dynamic and static are built, so keep only the one needed
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/apr-1.lib
+                ${CURRENT_PACKAGES_DIR}/lib/aprapp-1.lib
+                ${CURRENT_PACKAGES_DIR}/debug/lib/apr-1.lib
+                ${CURRENT_PACKAGES_DIR}/debug/lib/aprapp-1.lib)
+else()
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libapr-1.lib
+                ${CURRENT_PACKAGES_DIR}/lib/libaprapp-1.lib
+                ${CURRENT_PACKAGES_DIR}/debug/lib/libapr-1.lib
+                ${CURRENT_PACKAGES_DIR}/debug/lib/libaprapp-1.lib)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/apr)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/apr/LICENSE ${CURRENT_PACKAGES_DIR}/share/apr/copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index a265da175..26465b6b2 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -31,5 +31,6 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/fmt/fmt-targets.cmake ${CURRENT_PA
 file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/cmake)
 file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/fmt/fmt-targets.cmake ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake)
 
 vcpkg_copy_pdbs()
diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake
index dd85e104d..9c2aafdc1 100644
--- a/ports/libmysql/portfile.cmake
+++ b/ports/libmysql/portfile.cmake
@@ -42,7 +42,6 @@ file(REMOVE_RECURSE
 
 file(MAKE_DIRECTORY
 	${CURRENT_PACKAGES_DIR}/share
-	${CURRENT_PACKAGES_DIR}/debug/share
 	${CURRENT_PACKAGES_DIR}/bin
 	${CURRENT_PACKAGES_DIR}/debug/bin)
 
diff --git a/ports/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake
index 718ca6ca1..9ce215bbc 100644
--- a/ports/openjpeg/portfile.cmake
+++ b/ports/openjpeg/portfile.cmake
@@ -24,6 +24,11 @@ string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" OPENJPEG_DEBUG_MO
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/openjpeg/OpenJPEGTargets-debug.cmake  "${OPENJPEG_DEBUG_MODULE}")
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
+# Cleanup bin directories in static builds
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
 # Cleanup Visual C++ Redistributable runtime
 file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/msvcp140.dll)
 file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/vcruntime140.dll)
diff --git a/ports/openssl/CMakeLists.txt b/ports/openssl/CMakeLists.txt
index acb9bc7a5..1fa0f30d0 100644
--- a/ports/openssl/CMakeLists.txt
+++ b/ports/openssl/CMakeLists.txt
@@ -3,7 +3,7 @@ project(openssl NONE)
 
 include(vcpkg_execute_required_process)
 include(vcpkg_apply_patches)
-set(SOURCE_PATH ${CMAKE_CURRENT_BINARY_DIR}/openssl-1.0.2h)
+set(SOURCE_PATH ${CMAKE_CURRENT_BINARY_DIR}/openssl-1.0.2j)
 
 find_program(PERL perl)
 find_program(NMAKE nmake)
diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index 9ee9ef163..d0cd893f5 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl
-Version: 1.0.2h-1
+Version: 1.0.2j
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
\ No newline at end of file
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
index 49d322095..1d3d40b78 100644
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@@ -1,6 +1,6 @@
 include(${CMAKE_TRIPLET_FILE})
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-1.0.2h)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-1.0.2j)
 vcpkg_find_acquire_program(PERL)
 find_program(NMAKE nmake)
 
@@ -8,9 +8,9 @@ get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
 set(ENV{PATH} "${PERL_EXE_PATH};$ENV{PATH}")
 
 vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
-    URLS "https://www.openssl.org/source/openssl-1.0.2h.tar.gz"
-    FILENAME "openssl-1.0.2h.tar.gz"
-    SHA512 780601f6f3f32f42b6d7bbc4c593db39a3575f9db80294a10a68b2b0bb79448d9bd529ca700b9977354cbdfc65887c76af0aa7b90d3ee421f74ab53e6f15c303
+    URLS "https://www.openssl.org/source/openssl-1.0.2j.tar.gz"
+    FILENAME "openssl-1.0.2j.tar.gz"
+    SHA512 7d6ccae4aa3ccec3a5d128da29c68401cdb1210cba6d212d55235fc3bc63d7085e2f119e2bbee7ddff6b7b5eef07c6196156791724cd2caf313a4c2fef724edd
 )
 
 file(COPY
@@ -30,7 +30,7 @@ vcpkg_configure_cmake(
         -DOPENSSL_SOURCE_ARCHIVE=${OPENSSL_SOURCE_ARCHIVE}
         -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
         -DTRIPLET_SYSTEM_ARCH=${TRIPLET_SYSTEM_ARCH}
-        -DVERSION=1.0.2h
+        -DVERSION=1.0.2j
         -DTARGET_TRIPLET=${TARGET_TRIPLET}
 )
 
diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake
index 5a546967a..2266cfe35 100644
--- a/ports/tiff/portfile.cmake
+++ b/ports/tiff/portfile.cmake
@@ -34,4 +34,8 @@ file(RENAME
 )
 file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
 file(REMOVE ${EXES})
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
 vcpkg_copy_pdbs()
diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake
index 35ca5ff6d..1d6d807d4 100644
--- a/ports/zlib/portfile.cmake
+++ b/ports/zlib/portfile.cmake
@@ -18,6 +18,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+# Both dynamic and static are built, so keep only the one needed
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib)
 else()