From 9a72b227cd11404f1bc09eb093028b795cbef1bd Mon Sep 17 00:00:00 2001
From: Phil Christensen <philc@microsoft.com>
Date: Tue, 18 Dec 2018 16:12:19 -0800
Subject: [antlr4] move to vcpkg_extract_source_archive_ex

---
 ports/antlr4/CONTROL        |  2 +-
 ports/antlr4/portfile.cmake | 27 +++++++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL
index 2254d4d80..900f2622e 100644
--- a/ports/antlr4/CONTROL
+++ b/ports/antlr4/CONTROL
@@ -1,3 +1,3 @@
 Source: antlr4
-Version: 4.7.1-1
+Version: 4.7.1-2
 Description: ANother Tool for Language Recognition
\ No newline at end of file
diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake
index 886a1ab64..de3e2f634 100644
--- a/ports/antlr4/portfile.cmake
+++ b/ports/antlr4/portfile.cmake
@@ -5,7 +5,6 @@ endif()
 include(vcpkg_common_functions)
 
 set(VERSION 4.7.1)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/runtime)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "http://www.antlr.org/download/antlr4-cpp-runtime-4.7.1-source.zip"
@@ -20,11 +19,11 @@ vcpkg_download_distfile(LICENSE
     SHA512 1e8414de5fdc211e3188a8ec3276c6b3c55235f5edaf48522045ae18fa79fd9049719cb8924d25145016f223ac9a178defada1eeb983ccff598a08b0c0f67a3b
 )
 
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src
-    PATCHES     ${CMAKE_CURRENT_LIST_DIR}/crt_mt.patch
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    NO_REMOVE_ONE_LEVEL
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/crt_mt.patch
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -36,14 +35,14 @@ else()
 endif()
 
 vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/antlr4cpp-vs2015.vcxproj
+    PROJECT_PATH ${SOURCE_PATH}/runtime/antlr4cpp-vs2015.vcxproj
     DEBUG_CONFIGURATION ${DEBUG_CONFIG}
     RELEASE_CONFIGURATION ${RELEASE_CONFIG}
 )
 
 file (MAKE_DIRECTORY
     ${CURRENT_PACKAGES_DIR}/include)
-FILE(COPY            ${SOURCE_PATH}/src/
+FILE(COPY            ${SOURCE_PATH}/runtime/src/
      DESTINATION     ${CURRENT_PACKAGES_DIR}/include
      FILES_MATCHING PATTERN "*.h")
 
@@ -51,9 +50,9 @@ file (MAKE_DIRECTORY
     ${CURRENT_PACKAGES_DIR}/lib
     ${CURRENT_PACKAGES_DIR}/debug/lib)
 
-file(COPY       ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.lib
+file(COPY       ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.lib
     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-file(COPY       ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.lib
+file(COPY       ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.lib
     DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -67,12 +66,12 @@ else()
         ${CURRENT_PACKAGES_DIR}/debug/bin)
 
     file(COPY
-        ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.dll
-        ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.pdb
+        ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.dll
+        ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.pdb
         DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
     file(COPY
-        ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.dll
-        ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.pdb
+        ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.dll
+        ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.pdb
         DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
 endif()
 
-- 
cgit v1.2.3