Copy icu4c dylib symlinks in mac deploy
3 files changed, 7 insertions, 6 deletions
diff --git a/.ci/install.sh b/.ci/install.sh
index f87685f9..72c34127 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -6,11 +6,6 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update
brew install qt5 lmdb clang-format ninja libsodium cmark
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
sudo python get-pip.py
diff --git a/.ci/macos/deploy.sh b/.ci/macos/deploy.sh
index 7ab6831d..c573e2a6 100755
--- a/.ci/macos/deploy.sh
+++ b/.ci/macos/deploy.sh
@@ -9,6 +9,12 @@ PATH=/usr/local/opt/qt/bin/:${PATH}
pushd build
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)
sudo chown ${user} nheko.dmg
mv nheko.dmg ..
diff --git a/.travis.yml b/.travis.yml
index f749a6e0..afe6fb6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ matrix:
osx_image: xcode9
env:
- DEPLOYMENT=1
- - USE_BUNDLED_BOOST=1
+ - USE_BUNDLED_BOOST=0
- USE_BUNDLED_CMARK=0
- os: linux
compiler: gcc
|
