diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-11-29 22:42:23 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-11-29 22:42:23 +0000 |
| commit | 25fd4d4f0607677f221397912b7eec6e17602925 (patch) | |
| tree | 831c7e5d527d3985b131dbb0cb7d6e0330ed13a4 | |
| parent | 8dd2b4c9840cff4cbe98526f63cabd952ee9b2d3 (diff) | |
| download | navit-25fd4d4f0607677f221397912b7eec6e17602925.tar.gz | |
Moving linux dependencies installation to the build script
| -rw-r--r-- | ci/build_linux.sh | 2 | ||||
| -rw-r--r-- | circle.yml | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/ci/build_linux.sh b/ci/build_linux.sh index 74fe4a136..8c3ca1b9b 100644 --- a/ci/build_linux.sh +++ b/ci/build_linux.sh @@ -1,3 +1,5 @@ +sudo apt-get install cmake libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev g++ libgtk2.0-dev + if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trunk" ]]; then tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH diff --git a/circle.yml b/circle.yml index 31ba6d2d7..7c1f19333 100644 --- a/circle.yml +++ b/circle.yml @@ -12,13 +12,6 @@ dependencies: - "[ -d ~/android ] || mkdir ~/android" - wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz - sudo apt-get update - - sudo apt-get install cmake - - sudo apt-get install libpng12-dev - - sudo apt-get install librsvg2-bin - - sudo apt-get install libfreetype6-dev - - sudo apt-get install libdbus-glib-1-dev - - sudo apt-get install g++ - - sudo apt-get install libgtk2.0-dev - bash ci/update_version.sh prepare - bash ci/build_linux.sh - sed -i '/INTEGER/d' bin/po/navit.pot |