diff --git a/run_config.json b/run_config.json index e57cec16..36921c22 100644 --- a/run_config.json +++ b/run_config.json @@ -27,7 +27,7 @@ "prereq": { "name": "Get ICU4C 78", "version": "78.1", - "command": "bash ../executors/cpp/set_icu4c_binary.sh ../gh-cache icu4c-78.1-Ubuntu22.04-x64.tgz icu4c-78.1-src.tgz" + "command": "bash ../executors/cpp/set_icu4c_binary.sh ../gh-cache icu4c-78.1-Ubuntu22.04-x64.tgz icu4c-78.1-sources.tgz" }, "run": { "icu_version": "icu78", diff --git a/setup_macos.sh b/setup_macos.sh index 022a1a4f..c941b3ed 100755 --- a/setup_macos.sh +++ b/setup_macos.sh @@ -10,10 +10,15 @@ if ! command -v brew >/dev/null 2>&1; then fi # Check if json-c is already installed via Homebrew -if ! brew list json-c >/dev/null 2>&1; then +if ! command -v json-c >/dev/null 2>&1; then brew install json-c fi +# Check if Maven is already installed via Homebrew +if ! command -v mvn >/dev/null 2>&1; then + brew install maven +fi + # Download ICU4C binaries if the cache directory doesn't exist if [[ ! -d gh-cache ]] then @@ -34,7 +39,7 @@ if [[ ${error_code:-0} -ne 0 ]] then # On Mac, `enum` is a standard built-in library for Python 3.4+. # If this fails, the system Python is likely broken or too old, so we install a fresh python3. - if ! brew list python3 >/dev/null 2>&1; then + if ! command -v python3 >/dev/null 2>&1; then brew install python3 fi fi @@ -112,6 +117,13 @@ function download_77_1() { fi } +function download_78_1() { + if [[ ! -f icu4c-78.1-sources.tgz ]] + then + curl -L -O https://github.com/unicode-org/icu/releases/download/release-78.1/icu4c-78.1-sources.tgz + fi +} + pushd gh-cache download_71_1 @@ -122,5 +134,6 @@ download_74_2 download_75_1 download_76_1 download_77_1 +download_78_1 popd \ No newline at end of file