diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2017-10-24 10:09:36 +0200 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2017-10-24 10:09:36 +0200 |
| commit | 0374d7cbb4b586feed1e203a8260de923ca3b5b1 (patch) | |
| tree | e0d63ce2392da93c6049d00f5c51f196fd34b9f8 | |
| parent | c3b5b264e14554c922f4c7eeb3860d340d2f59d7 (diff) | |
Missing src/main swaps
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | release-mac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index a02d4b4b..9b39a548 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,7 @@ script: - qmake -Wall qtpass.pro - make -j$(nproc) - make check TESTARGS="--platform offscreen" -- if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt src/QtPass.app; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt main/QtPass.app; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/FAQ\.md/https:\/\/qtpass.org\/docs\/md_FAQ.html/' < README.md > README.faq; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/CONTRIBUTING\.md/https:\/\/qtpass.org\/docs\/md_CONTRIBUTING.html/' < README.faq > README.contrib; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/\[\!.*//' < README.contrib > README.clean; fi diff --git a/release-mac b/release-mac index 1d415b20..6f1d592f 100755 --- a/release-mac +++ b/release-mac @@ -4,4 +4,4 @@ sed 's/CHANGELOG\.md/https:\/\/qtpass.org\/docs\/md__c_h_a_n_g_e_l_o_g.html/' < sed 's/\[\!.*//' < README.changelog > README.clean pandoc --standalone --from=markdown_github --to=rtf --output=README.rtf README.clean FAQ.md CONTRIBUTING.md CHANGELOG.md doxygen -qmake CONFIG+=release && make && macdeployqt src/QtPass.app && appdmg appdmg.json main/QtPass.dmg +qmake CONFIG+=release && make && macdeployqt main/QtPass.app && appdmg appdmg.json main/QtPass.dmg |