Skip to content
This repository has been archived by the owner on Mar 4, 2021. It is now read-only.

Commit

Permalink
Merge pull request #23 from camrein/osx_build_fix_v2
Browse files Browse the repository at this point in the history
Osx build fix v2
  • Loading branch information
camrein authored May 9, 2017
2 parents 8a00b9d + 90d2d65 commit 54335b2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ os:

before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt@5.7 ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link --force qt@5.7 ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt55 ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link --force qt55 ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository --yes ppa:beineri/opt-qt551-trusty ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -qq qt55base qt55serialport ; fi
Expand All @@ -22,7 +22,10 @@ script:
- qmake -v
- qmake -config release EzGraver.pro
- make
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then macdeployqt EzGraverUi/EzGraverUi.app -dmg -libpath="$(pwd)/EzGraverCore" ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir EzGraverUi/EzGraverUi.app/Contents/Frameworks/ ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cp EzGraverCore/libEzGraverCore.1.dylib EzGraverUi/EzGraverUi.app/Contents/Frameworks/libEzGraverCore.1.dylib ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then macdeployqt EzGraverUi/EzGraverUi.app -dmg ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then otool -L EzGraverUi/EzGraverUi.app/Contents/MacOS/EzGraverUi ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mv EzGraverUi/EzGraverUi.dmg EzGraverUi/EzGraver_osx.dmg; fi

deploy:
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@ qmake -config release EzGraver.pro
make
```

Generate a \*.dmg file for deployment. The libpath argument denotes the location of EzGraverCore's \*.dylib files.
Copy EzGraverCore into the frameworks directory and then generate the \*.dmg file for deployment.
```bash
mkdir EzGraverUi/EzGraverUi.app/Contents/Frameworks/
cp EzGraverCore/libEzGraverCore.1.dylib EzGraverUi/EzGraverUi.app/Contents/Frameworks/libEzGraverCore.1.dylib
macdeployqt EzGraverUi/EzGraverUi.app -dmg -libpath="$(pwd)/EzGraverCore"
```

Expand Down

0 comments on commit 54335b2

Please sign in to comment.