diff --git a/.travis/script.sh b/.travis/script.sh index fb7acc6..aac1319 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -BUILD_VERSION="$TRAVIS_BRANCH" +BUILD_VERSION="0.0.0" if [[ -n "$TRAVIS_TAG" ]] then BUILD_VERSION="$TRAVIS_TAG" diff --git a/appveyor.yml b/appveyor.yml index 2cae726..6f8a68a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,7 +15,7 @@ install: - set PATH=%PATH%;%PYTHON%;%PYTHON%\Scripts; - set PATH=%PATH%;"C:\Program Files (x86)\Inno Setup 5"; - if defined APPVEYOR_REPO_TAG_NAME set BUILD_VERSION=%APPVEYOR_REPO_TAG_NAME% -- if not defined APPVEYOR_REPO_TAG_NAME set BUILD_VERSION=%APPVEYOR_REPO_BRANCH% +- if not defined APPVEYOR_REPO_TAG_NAME set BUILD_VERSION="0.0.0" - python --version - qmake -v - pip install Pillow diff --git a/src/src.pro b/src/src.pro index 06c7fbd..db1aebc 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,18 +2,21 @@ TEMPLATE = subdirs SUBDIRS = \ zipper \ - memorymap/src \ - propterm \ - projectview/src \ propellermanager \ + projectview \ + memorymap \ + propterm \ propelleride propterm.depends = propellermanager -memorymap/src.depends = propellermanager -memorymap/src.depends = projectview/src +memorymap.depends = propellermanager projectview propelleride.depends = zipper \ - memorymap/src \ + memorymap \ propterm \ - projectview/src \ - propellermanager \ + projectview \ + propellermanager + +memorymap.subdir = memorymap/src +projectview.subdir = projectview/src +