diff options
| author | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2015-08-24 09:48:16 -0700 |
|---|---|---|
| committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2015-08-24 09:48:16 -0700 |
| commit | 3419038f32dec54ae0a06196cdc599a436faf25f (patch) | |
| tree | b0731de3948bdb17ce05f87e6829823b2b45fc07 | |
| parent | 8a2589dee6175717d693cc494039767f14daea2e (diff) | |
| parent | 0d17bb02a7391053580bae58ff2dca0c5cd2ae46 (diff) | |
| download | navit-3419038f32dec54ae0a06196cdc599a436faf25f.tar.gz | |
Merge pull request #19 from navit-gps/circle.yml-update
Circle.yml update
| -rw-r--r-- | ci/build.sh | 2 | ||||
| -rw-r--r-- | circle.yml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ci/build.sh b/ci/build.sh index 00d0d2d56..229f57f25 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -2,7 +2,7 @@ tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH mkdir bin && cd bin -cov-build --dir cov-int cmake ../ -DSAMPLE_MAP=n -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE +cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE cov-build --dir cov-int make || exit -1 tar czvf navit.tgz cov-int diff --git a/circle.yml b/circle.yml index 31d78294b..741864643 100644 --- a/circle.yml +++ b/circle.yml @@ -3,7 +3,7 @@ machine: ANDROID_HOME: /home/ubuntu/android ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk ANDROID_SDK_CDN: https://dl.google.com/android - ANDROID_SDK_FILE: android-sdk_r24.3.3-linux.tgz + ANDROID_SDK_FILE: android-sdk_r24.3.4-linux.tgz ANDROID_NDK_CDN: http://dl.google.com/android/ndk ANDROID_NDK_FILE: android-ndk-r10e-linux-x86_64.bin CMAKE_FILE: ../Toolchain/arm-eabi.cmake @@ -18,8 +18,8 @@ dependencies: - 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 libgtk2.0-dev + - sudo apt-get install libpng12-dev +# - sudo apt-get install libgtk2.0-dev - sudo apt-get install librsvg2-bin - sudo apt-get install libfreetype6-dev - sudo apt-get install libdbus-glib-1-dev @@ -33,7 +33,7 @@ dependencies: - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE - sudo apt-get install gettext - - sudo apt-get install openjdk-7-jdk + - sudo apt-get install openjdk-8-jdk - sudo apt-get install ant - sudo apt-get install libsaxonb-java # for aapt |