diff options
| author | Nick Strupat <nick.strupat@gmail.com> | 2021-04-01 13:31:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-01 10:31:47 -0700 |
| commit | c72572f731931927afb979fdfae9c067b14256f4 (patch) | |
| tree | 12ab739b42ed275fe0ff7557b4684487465b6977 | |
| parent | 5d1b3e8081ae45f22d85bccfd360f2af1f98fe17 (diff) | |
| download | vcpkg-c72572f731931927afb979fdfae9c067b14256f4.tar.gz vcpkg-c72572f731931927afb979fdfae9c067b14256f4.zip | |
[antlr4] update to 4.9.1 (#16383)
* [antlr4] update to 4.9.1
* update version
* [antlr4] fix utfcpp dependency issue
* fix version SHA to account for utfcpp patch
* [antlr4] Minimize patch
Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
| -rw-r--r-- | ports/antlr4/CONTROL | 3 | ||||
| -rw-r--r-- | ports/antlr4/fix_utfcpp_dependency.patch | 45 | ||||
| -rw-r--r-- | ports/antlr4/portfile.cmake | 12 | ||||
| -rw-r--r-- | versions/a-/antlr4.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 4 |
5 files changed, 60 insertions, 9 deletions
diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL index e48354528..64287d02b 100644 --- a/ports/antlr4/CONTROL +++ b/ports/antlr4/CONTROL @@ -1,6 +1,5 @@ Source: antlr4 -Version: 4.8 -Port-Version: 1 +Version: 4.9.1 Homepage: https://www.antlr.org Description: ANother Tool for Language Recognition Build-Depends: libuuid (!uwp&!windows&!osx) diff --git a/ports/antlr4/fix_utfcpp_dependency.patch b/ports/antlr4/fix_utfcpp_dependency.patch new file mode 100644 index 000000000..629e12f38 --- /dev/null +++ b/ports/antlr4/fix_utfcpp_dependency.patch @@ -0,0 +1,45 @@ +diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt +index a8503bb61..e7b01b7cb 100644 +--- a/runtime/CMakeLists.txt ++++ b/runtime/CMakeLists.txt +@@ -1,17 +1,3 @@ +- +-include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) +- +-set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty) +-set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp) +-ExternalProject_Add( +- utfcpp +- GIT_REPOSITORY "git://github.com/nemtrif/utfcpp" +- GIT_TAG "v3.1.1" +- SOURCE_DIR ${UTFCPP_DIR} +- UPDATE_DISCONNECTED 1 +- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -Dgtest_force_shared_crt=ON +- TEST_AFTER_INSTALL 1 +- STEP_TARGETS build) + + + include_directories( +@@ -23,8 +13,6 @@ include_directories( + ${PROJECT_SOURCE_DIR}/runtime/src/tree + ${PROJECT_SOURCE_DIR}/runtime/src/tree/pattern + ${PROJECT_SOURCE_DIR}/runtime/src/tree/xpath +- ${UTFCPP_DIR}/install/include/utf8cpp +- ${UTFCPP_DIR}/install/include/utf8cpp/utf8 + ) + + +@@ -131,13 +119,6 @@ install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/" + FILES_MATCHING PATTERN "*.h" + ) + +-install(FILES "${UTFCPP_DIR}/source/utf8.h" +- DESTINATION "include/antlr4-runtime") +-install(DIRECTORY "${UTFCPP_DIR}/source/utf8" +- DESTINATION "include/antlr4-runtime" +- COMPONENT dev +- FILES_MATCHING PATTERN "*.h" +- ) + + + diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index 6ceaa3af9..1770cabfc 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_fail_port_install(ON_TARGET "uwp")
-set(VERSION 4.8)
+set(VERSION 4.9.1)
vcpkg_download_distfile(ARCHIVE
URLS "http://www.antlr.org/download/antlr4-cpp-runtime-${VERSION}-source.zip"
FILENAME "antlr4-cpp-runtime-${VERSION}-source.zip"
- SHA512 df76a724e8acf29018ad122d909e1d43e7c8842e1c0df8022a3e8c840cb2b99de49cc148f75fef519b65ece9bd27b92cf0067c9099b664c127e80559c6492322
+ SHA512 fe33005f73f8d408fcea8ebab62c0def119bbe0c075f04a66404d0df258126eb6caf0a8bbac34d5c4c9e79d4aa8896f32698a560d4be7d71a32dcc3457245cee
)
# license not exist in antlr folder.
@@ -20,9 +20,11 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE}
NO_REMOVE_ONE_LEVEL
REF ${VERSION}
- PATCHES fixed_build.patch
- uuid_discovery_fix.patch
- export_guid.patch
+ PATCHES
+ fixed_build.patch
+ uuid_discovery_fix.patch
+ export_guid.patch
+ fix_utfcpp_dependency.patch
)
vcpkg_configure_cmake(
diff --git a/versions/a-/antlr4.json b/versions/a-/antlr4.json index d6c0f8755..fbf64088f 100644 --- a/versions/a-/antlr4.json +++ b/versions/a-/antlr4.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "846cffb150c26539ce36129c5a45d7ce54e6a1c8", + "version-string": "4.9.1", + "port-version": 0 + }, + { "git-tree": "ed270bdb7075f6ed46cbe345c367ecb00ef64eff", "version-string": "4.8", "port-version": 1 diff --git a/versions/baseline.json b/versions/baseline.json index 4adebc09d..02e8935db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -81,8 +81,8 @@ "port-version": 2 }, "antlr4": { - "baseline": "4.8", - "port-version": 1 + "baseline": "4.9.1", + "port-version": 0 }, "any-lite": { "baseline": "0.2.0", |