diff options
| -rw-r--r-- | .appveyor.yml | 6 | ||||
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | qtpass.iss | 6 | ||||
| -rw-r--r-- | qtpass.pri | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 |
5 files changed, 12 insertions, 10 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 6e2e7016..095d3203 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,12 +6,12 @@ build_script: - qmake qtpass.pro CONFIG+=static - mingw32-make #after_build: - - cmd: copy ..\README.md release\README.txt - - cmd: copy ..\LICENSE release\LICENSE.txt + - cmd: copy README.md src/release\README.txt + - cmd: copy LICENSE src/release\LICENSE.txt - iscc qtpass.iss artifacts: - path: Output\qtpass-*.exe - - path: release\qtpass.exe + - path: src/release\qtpass.exe deploy: provider: GitHub auth_token: diff --git a/.travis.yml b/.travis.yml index a3e71c37..a7d17677 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,13 +36,13 @@ script: - qmake -v - qmake -Wall qtpass.pro - make -j$(nproc) -- if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt QtPass.app; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt src/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 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then pandoc --standalone --from=markdown_github --to=rtf --output=README.rtf README.clean; fi -- if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION qtpass.pro | cut -d " " -f 6).dmg; fi -- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export VERSION=$(grep ^VERSION qtpass.pro | cut -d " " -f 6); fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION qtpass.pri | cut -d " " -f 6).dmg; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export VERSION=$(grep ^VERSION qtpass.pri | cut -d " " -f 6); fi notifications: irc: channels: @@ -73,9 +73,9 @@ Source: "{#QtDir}\bin\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "{#QtDir}\plugins\platforms\qwindows.dll"; DestDir: "{app}\platforms\"; Flags: ignoreversion
Source: "{#QtDir}\plugins\iconengines\qsvgicon.dll"; DestDir: "{app}\iconengines\"; Flags: ignoreversion
-Source: "release\qtpass.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "release\README.txt"; DestDir: "{app}"; Flags: ignoreversion
-Source: "release\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
+Source: "src\release\qtpass.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "src\release\README.txt"; DestDir: "{app}"; Flags: ignoreversion
+Source: "src\release\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
[Icons]
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
diff --git a/qtpass.pri b/qtpass.pri new file mode 100644 index 00000000..38a0b33f --- /dev/null +++ b/qtpass.pri @@ -0,0 +1,2 @@ +VERSION = 1.2.0-pre + diff --git a/src/src.pro b/src/src.pro index 841dc58d..20cd4fac 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,4 @@ -VERSION = 1.2.0-pre +!include(../qtpass.pri) { error("Couldn't find the auto.pri file!") } TEMPLATE = app QT += core gui |