Merge pull request #4958 from albertfong/antlr4.7.1

[antlr4] Upgrade to antlr4 to 4.7.1

3 files changed, 21 insertions, 74 deletions

diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL
index bf4df8d1c..900f2622e 100644
--- a/ports/antlr4/CONTROL
+++ b/ports/antlr4/CONTROL
@@ -1,3 +1,3 @@
 Source: antlr4
-Version: 4.7
+Version: 4.7.1-2
 Description: ANother Tool for Language Recognition
\ No newline at end of file
diff --git a/ports/antlr4/Fix-building-in-Visual-Studio-2017.patch b/ports/antlr4/Fix-building-in-Visual-Studio-2017.patch
deleted file mode 100644
index 64e483599..000000000
--- a/ports/antlr4/Fix-building-in-Visual-Studio-2017.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/runtime/src/ANTLRInputStream.h b/runtime/src/ANTLRInputStream.h
-index 3d85bed..813451c 100644
---- a/runtime/src/ANTLRInputStream.h
-+++ b/runtime/src/ANTLRInputStream.h
-@@ -16,7 +16,7 @@ namespace antlr4 {
-   protected:
-     /// The data being scanned.
-     // UTF-32
--#if defined(_MSC_VER) && _MSC_VER == 1900
-+#if defined(_MSC_VER) && _MSC_VER >= 1900
-     i32string _data; // Custom type for VS 2015.
- #else
-     std::u32string _data;
-diff --git a/runtime/src/UnbufferedCharStream.h b/runtime/src/UnbufferedCharStream.h
-index b489f18..295804c 100644
---- a/runtime/src/UnbufferedCharStream.h
-+++ b/runtime/src/UnbufferedCharStream.h
-@@ -52,7 +52,7 @@ namespace antlr4 {
-     /// we keep adding to buffer. Otherwise, <seealso cref="#consume consume()"/> resets so
-     /// we start filling at index 0 again.
-     // UTF-32 encoded.
--#if defined(_MSC_VER) && _MSC_VER == 1900
-+#if defined(_MSC_VER) && _MSC_VER >= 1900
-     i32string _data; // Custom type for VS 2015.
- #else
-     std::u32string _data;
-diff --git a/runtime/src/antlr4-common.h b/runtime/src/antlr4-common.h
-index 197fd6d..8357b3e 100644
---- a/runtime/src/antlr4-common.h
-+++ b/runtime/src/antlr4-common.h
-@@ -52,7 +52,7 @@
-     typedef __int32 ssize_t;
-   #endif
- 
--  #if _MSC_VER == 1900
-+  #if _MSC_VER >= 1900
-     // VS 2015 has a known bug when using std::codecvt_utf8<char32_t>
-     // so we have to temporarily use __int32 instead.
-     // https://connect.microsoft.com/VisualStudio/feedback/details/1403302/unresolved-external-when-using-codecvt-utf8
-diff --git a/runtime/src/support/StringUtils.h b/runtime/src/support/StringUtils.h
-index cb751a7..be14bbb 100644
---- a/runtime/src/support/StringUtils.h
-+++ b/runtime/src/support/StringUtils.h
-@@ -10,7 +10,7 @@
- namespace antlrcpp {
-   // For all conversions utf8 <-> utf32.
-   // VS 2015 has a bug in std::codecvt_utf8<char32_t> (VS 2013 works fine).
--#if defined(_MSC_VER) && _MSC_VER == 1900
-+#if defined(_MSC_VER) && _MSC_VER >= 1900
-   static std::wstring_convert<std::codecvt_utf8<__int32>, __int32> utfConverter;
- #else
-   static std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> utfConverter;
diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake
index 0d77208e0..3663a9347 100644
--- a/ports/antlr4/portfile.cmake
+++ b/ports/antlr4/portfile.cmake
@@ -4,28 +4,26 @@ endif()
 

 include(vcpkg_common_functions)

 

-set(VERSION 4.7)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/runtime)

+set(VERSION 4.7.1)

 

 vcpkg_download_distfile(ARCHIVE

-    URLS "http://www.antlr.org/download/antlr4-cpp-runtime-4.7-source.zip"

+    URLS "http://www.antlr.org/download/antlr4-cpp-runtime-4.7.1-source.zip"

     FILENAME "antlr4-cpp-runtime-${VERSION}-source.zip"

-    SHA512 a14fd3320537075a8d4c1cfa81d416bad6257d238608e2428f4930495072cce984c707126e3777ffd3849dd6b6cdf1bf43624bd6d318b1fa5dd6749a7304f808

+    SHA512 24d53278db56b199e6787242f22339f74e07d2cd3ed56f851ad905b110c2ba3cb001e1e2fcbc8624f0e93e00ba1fe1b23630dd1a736558c694655aeb1c3129da

 )

 

 # license not exist in antlr folder.

 vcpkg_download_distfile(LICENSE

     URLS https://raw.githubusercontent.com/antlr/antlr4/${VERSION}/LICENSE.txt

-    FILENAME "antlr4-copyright"

-    SHA512 c72ae3d5c9f3f07160405b5ca44f01116a9602d82291d6cd218fcc5ec6e8baf985e4baa2acf3d621079585385708bd171c96ef44dd808e60c40a48bc1f56c9ae

+    FILENAME "antlr4-copyright_${VERSION}"

+    SHA512 1e8414de5fdc211e3188a8ec3276c6b3c55235f5edaf48522045ae18fa79fd9049719cb8924d25145016f223ac9a178defada1eeb983ccff598a08b0c0f67a3b

 )

 

-vcpkg_extract_source_archive(${ARCHIVE})

-

-vcpkg_apply_patches(

-    SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src

-    PATCHES     ${CMAKE_CURRENT_LIST_DIR}/crt_mt.patch

-                ${CMAKE_CURRENT_LIST_DIR}/Fix-building-in-Visual-Studio-2017.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")

@@ -37,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")

 

@@ -52,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")

@@ -68,15 +66,16 @@ 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()

 

 file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/antlr4 RENAME copyright)

 

-message(STATUS "Installing done")
\ No newline at end of file
+message(STATUS "Installing done")

+#
\ No newline at end of file