From 666cc9cee23c11ade0471a59a52afc3f7f8754c0 Mon Sep 17 00:00:00 2001 From: Albert Fong Date: Wed, 12 Dec 2018 02:59:01 -0800 Subject: [antlr4] Upgrade to antlr 4.7.1 --- ports/antlr4/CONTROL | 2 +- .../Fix-building-in-Visual-Studio-2017.patch | 52 ---------------------- ports/antlr4/portfile.cmake | 9 ++-- 3 files changed, 5 insertions(+), 58 deletions(-) delete mode 100644 ports/antlr4/Fix-building-in-Visual-Studio-2017.patch diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL index bf4df8d1c..af881f1c3 100644 --- a/ports/antlr4/CONTROL +++ b/ports/antlr4/CONTROL @@ -1,3 +1,3 @@ Source: antlr4 -Version: 4.7 +Version: 4.7.1 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, 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 - // 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 (VS 2013 works fine). --#if defined(_MSC_VER) && _MSC_VER == 1900 -+#if defined(_MSC_VER) && _MSC_VER >= 1900 - static std::wstring_convert, __int32> utfConverter; - #else - static std::wstring_convert, char32_t> utfConverter; diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index 0d77208e0..886a1ab64 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -4,20 +4,20 @@ endif() include(vcpkg_common_functions) -set(VERSION 4.7) +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-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 + SHA512 1e8414de5fdc211e3188a8ec3276c6b3c55235f5edaf48522045ae18fa79fd9049719cb8924d25145016f223ac9a178defada1eeb983ccff598a08b0c0f67a3b ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -25,7 +25,6 @@ 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 ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") -- cgit v1.2.3 From 02c27dd55ec6401dd9c0b3af99e96b4d7cfd82a8 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 13 Dec 2018 15:53:32 -0800 Subject: [antlr4] bump dash version in control file Done to force test to run --- ports/antlr4/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL index af881f1c3..2254d4d80 100644 --- a/ports/antlr4/CONTROL +++ b/ports/antlr4/CONTROL @@ -1,3 +1,3 @@ Source: antlr4 -Version: 4.7.1 +Version: 4.7.1-1 Description: ANother Tool for Language Recognition \ No newline at end of file -- cgit v1.2.3 From 9a72b227cd11404f1bc09eb093028b795cbef1bd Mon Sep 17 00:00:00 2001 From: Phil Christensen 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 From 8b79329303a1b16ed10e52922cde7976f6abf1c3 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 19 Dec 2018 15:52:22 -0800 Subject: [antlr4] change portfile to trigger testing --- ports/antlr4/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index de3e2f634..cda011c60 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -77,4 +77,5 @@ 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 -- cgit v1.2.3 From 6e3bd45c671e16e9b5534114204cbc66bc4b74eb Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 19 Dec 2018 23:45:38 -0800 Subject: [antlr4] fix copyright download name --- ports/antlr4/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index cda011c60..3663a9347 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_download_distfile(ARCHIVE # license not exist in antlr folder. vcpkg_download_distfile(LICENSE URLS https://raw.githubusercontent.com/antlr/antlr4/${VERSION}/LICENSE.txt - FILENAME "antlr4-copyright" + FILENAME "antlr4-copyright_${VERSION}" SHA512 1e8414de5fdc211e3188a8ec3276c6b3c55235f5edaf48522045ae18fa79fd9049719cb8924d25145016f223ac9a178defada1eeb983ccff598a08b0c0f67a3b ) -- cgit v1.2.3