Skip to content

Commit

Permalink
Merge pull request #18 from rleigh-codelibre/XERCESC-2200_appveyor_bu…
Browse files Browse the repository at this point in the history
…gfix-3.2

XERCESC-2200: Appveyor bug fix (3.2)
  • Loading branch information
rleigh-codelibre committed Jun 10, 2020
2 parents 89fe151 + 160b6e5 commit 7173fa7
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions scripts/ci-appveyor-setup
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,9 @@ download_file()
[ "$(sha512sum "$file")" = "$hash_output" ]
)

icu_source=icu4c-60_2-src.zip
icu_url="http://download.icu-project.org/files/icu4c/60.2/${icu_source}"
icu_hash="63232d6c15f725a60c14465b0479995b488b51288517e522abebdf5996fac7f214c424520bdbedb4c0801ea85ea7ad35de13e00512a25c1399cb827b0aca4744"

ninja_binary="ninja-win.zip"
ninja_url="https://github.com/ninja-build/ninja/releases/download/v1.8.2/${ninja_binary}"
ninja_hash="9b9ce248240665fcd6404b989f3b3c27ed9682838225e6dc9b67b551774f251e4ff8a207504f941e7c811e7a8be1945e7bcb94472a335ef15e23a0200a32e6d5"

icu_source=icu4c-60_3-src.zip
icu_url="https://github.com/unicode-org/icu/releases/download/release-60-3/${icu_source}"
icu_hash="8b6b5d8f629c3daea9f8b4b368db8701915ffdc1c90fe79876dd39a9c13f30968af1371fc1dcd443a9a4e02754edbd96a3592c6e6affb6b895687a1a3f70b0f6"

if [ "$msgloader" = "icu" ] || [ "$transcoder" = icu ]; then
cd "$AV_XERCES_CYG_DOWNLOAD"
Expand All @@ -46,11 +41,3 @@ if [ "$msgloader" = "icu" ] || [ "$transcoder" = icu ]; then
rm -rf icu
7z x "${AV_XERCES_DOWNLOAD}\\$icu_source"
fi

if [ "$generator" = "Ninja" ]; then
cd "$AV_XERCES_CYG_DOWNLOAD"
download_file "$ninja_url" "$ninja_binary" "$ninja_hash"
cd "$AV_XERCES_CYG_TOOLS"
rm -f ninja
7z e "${AV_XERCES_DOWNLOAD}\\$ninja_binary"
fi

0 comments on commit 7173fa7

Please sign in to comment.