Copy icu4c dylib symlinks in mac deploy

This commit is contained in:
redsky17 2019-02-05 00:35:03 +00:00
parent d72e362686
commit 9732c403ac
3 changed files with 7 additions and 6 deletions

View file

@ -6,11 +6,6 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update brew update
brew install qt5 lmdb clang-format ninja libsodium cmark brew install qt5 lmdb clang-format ninja libsodium cmark
brew upgrade boost cmake icu4c || true brew upgrade boost cmake icu4c || true
# make sure that ICU executables are added to the PATH
# and that the shared objects files can be found by the linker
export PATH="$(brew --prefix icu4c)/bin:$PATH"
export DYLD_FALLBACK_LIBRARY_PATH="$(brew --prefix icu4c)/lib:$DYLD_FALLBACK_LIBRARY_PATH"
export PKG_CONFIG_PATH="$(brew --prefix icu4c)/lib/pkgconfig:$PKG_CONFIG_PATH"
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
sudo python get-pip.py sudo python get-pip.py

View file

@ -9,6 +9,12 @@ PATH=/usr/local/opt/qt/bin/:${PATH}
pushd build pushd build
sudo macdeployqt nheko.app -dmg sudo macdeployqt nheko.app -dmg
# macdeployqt does not copy symlinks over.
# this specifically addresses icu4c issues but nothing else.
export ICU_LIB="$(brew --prefix icu4c)/lib"
find ${ICU_LIB} -type l -name "*.dylib" -exec cp {} nheko.app/Contents/Frameworks/ \; || true
user=$(id -nu) user=$(id -nu)
sudo chown ${user} nheko.dmg sudo chown ${user} nheko.dmg
mv nheko.dmg .. mv nheko.dmg ..

View file

@ -18,7 +18,7 @@ matrix:
osx_image: xcode9 osx_image: xcode9
env: env:
- DEPLOYMENT=1 - DEPLOYMENT=1
- USE_BUNDLED_BOOST=1 - USE_BUNDLED_BOOST=0
- USE_BUNDLED_CMARK=0 - USE_BUNDLED_CMARK=0
- os: linux - os: linux
compiler: gcc compiler: gcc