From b12f78c3ed08ca7cddb17110a2bcdcf2cd5f889e Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Tue, 29 Dec 2020 16:34:43 -0800
Subject: [PATCH] [antlr4,python3] Resolve cross port conflicts (#15378)

* [python3] Add vcpkg's include directories to the end rather than to the beginning.

This is safe because vcpkg never hydrates python3's $(PySrcDir)\externals directory, so it wasn't using vendored dependencies at all.

* [antlr4] Install antlr headers in antlr4-runtime rather than the root to avoid stomping on common name token.h.

This is consistent with the ubuntu packages.
---
 ports/antlr4/CONTROL                | 3 ++-
 ports/antlr4/portfile.cmake         | 6 ------
 ports/python3/python_vcpkg.props.in | 2 +-
 ports/python3/vcpkg.json            | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL
index 31614905af..e483545287 100644
--- a/ports/antlr4/CONTROL
+++ b/ports/antlr4/CONTROL
@@ -1,6 +1,7 @@
 Source: antlr4
 Version: 4.8
+Port-Version: 1
 Homepage: https://www.antlr.org
 Description: ANother Tool for Language Recognition
 Build-Depends: libuuid (!uwp&!windows&!osx)
-Supports: !uwp
\ No newline at end of file
+Supports: !uwp
diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake
index 5160648f3f..6ceaa3af9b 100644
--- a/ports/antlr4/portfile.cmake
+++ b/ports/antlr4/portfile.cmake
@@ -78,12 +78,6 @@ else()
     endif()
 endif()
 
-file(GLOB HDRS LIST_DIRECTORIES true ${CURRENT_PACKAGES_DIR}/include/antlr4-runtime/*)
-file(COPY ${HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/antlr4-runtime)
-
 vcpkg_copy_pdbs()
 
 file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-message(STATUS "Installing done")
\ No newline at end of file
diff --git a/ports/python3/python_vcpkg.props.in b/ports/python3/python_vcpkg.props.in
index efad43bbd2..c786e5fa06 100644
--- a/ports/python3/python_vcpkg.props.in
+++ b/ports/python3/python_vcpkg.props.in
@@ -6,7 +6,7 @@
       <PreprocessorDefinitions>_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="${VCPKG_LIBRARY_LINKAGE} == 'static'">XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>
-        ${CURRENT_INSTALLED_DIR}/include;%(AdditionalIncludeDirectories)
+        %(AdditionalIncludeDirectories);${CURRENT_INSTALLED_DIR}/include
       </AdditionalIncludeDirectories>
 
       <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'static|Debug'">MultiThreadedDebug</RuntimeLibrary>
diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json
index 5907ab9b90..b8aa2ac3c1 100644
--- a/ports/python3/vcpkg.json
+++ b/ports/python3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "python3",
   "version-string": "3.9.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The Python programming language",
   "homepage": "https://github.com/python/cpython",
   "supports": "!(arm | uwp)",