diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2017-08-25 18:02:54 -0700 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2017-08-25 18:02:54 -0700 |
| commit | 668d50240d8eec4fe6fdd7b83101483773cca6d1 (patch) | |
| tree | 55da24358a0839a3c319f1e15cba8295d237011b | |
| parent | 4af6e0d14be865d3b214b1d623c8078552381ead (diff) | |
| download | navit-668d50240d8eec4fe6fdd7b83101483773cca6d1.tar.gz | |
Setup common requirements
| -rw-r--r-- | .circleci/config.yml | 6 | ||||
| -rw-r--r-- | ci/build_linux.sh | 3 | ||||
| -rw-r--r-- | ci/build_tomtom_minimal.sh | 2 | ||||
| -rw-r--r-- | ci/build_tomtom_plugin.sh | 2 | ||||
| -rw-r--r-- | ci/build_win32.sh | 2 | ||||
| -rw-r--r-- | ci/setup_common_requirements.sh | 1 |
6 files changed, 9 insertions, 7 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 91875f91a..e807742f6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,6 +11,7 @@ jobs: - run: name: Build for Linux command: | + bash ci/setup_common_requirements.sh bash ci/build_linux.sh build_android_arm: <<: *defaults @@ -19,6 +20,7 @@ jobs: - run: name: Build for Android ARM command: | + bash ci/setup_common_requirements.sh bash ci/build_android.sh build_android_x86: <<: *defaults @@ -27,6 +29,7 @@ jobs: - run: name: Build for Android x86 command: | + bash ci/setup_common_requirements.sh bash ci/build_android_x86.sh build_win32: <<: *defaults @@ -35,6 +38,7 @@ jobs: - run: name: Build for Windows command: | + bash ci/setup_common_requirements.sh bash ci/build_win32.sh build_tomtom: <<: *defaults @@ -43,6 +47,7 @@ jobs: - run: name: Build for Tomtom command: | + bash ci/setup_common_requirements.sh bash ci/build_tomtom_minimal.sh build_tomtom_plugin: <<: *defaults @@ -51,6 +56,7 @@ jobs: - run: name: Build for Tomtom as a plugin command: | + bash ci/setup_common_requirements.sh bash ci/build_tomtom_plugin.sh workflows: diff --git a/ci/build_linux.sh b/ci/build_linux.sh index a4e111645..061ebd019 100644 --- a/ci/build_linux.sh +++ b/ci/build_linux.sh @@ -1,7 +1,6 @@ set -e -apt-get update -apt-get install -y cmake libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev g++ libgtk2.0-dev +apt-get install -y libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev cmake_opts="-Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n -Dgraphics/gtk_drawing_area:BOOL=TRUE" diff --git a/ci/build_tomtom_minimal.sh b/ci/build_tomtom_minimal.sh index 1c2b9ec2e..845224e05 100644 --- a/ci/build_tomtom_minimal.sh +++ b/ci/build_tomtom_minimal.sh @@ -7,8 +7,6 @@ set -e -apt-get update && apt-get install -y wget unzip cmake build-essential - export ARCH=arm-linux cp Toolchain/$ARCH.cmake /tmp diff --git a/ci/build_tomtom_plugin.sh b/ci/build_tomtom_plugin.sh index b6d489805..08966ddb7 100644 --- a/ci/build_tomtom_plugin.sh +++ b/ci/build_tomtom_plugin.sh @@ -6,8 +6,6 @@ set -e -apt-get update && apt-get install -y wget unzip cmake build-essential - export ARCH=arm-linux cp Toolchain/$ARCH.cmake /tmp diff --git a/ci/build_win32.sh b/ci/build_win32.sh index 1e1201375..47b05b9d2 100644 --- a/ci/build_win32.sh +++ b/ci/build_win32.sh @@ -1,4 +1,4 @@ -apt-get update && apt-get install -y mingw32 mingw32-binutils mingw32-runtime default-jdk nsis cmake gettext +apt-get update && apt-get install -y mingw32 mingw32-binutils mingw32-runtime default-jdk nsis mkdir win32 pushd win32 diff --git a/ci/setup_common_requirements.sh b/ci/setup_common_requirements.sh new file mode 100644 index 000000000..f5fa73cef --- /dev/null +++ b/ci/setup_common_requirements.sh @@ -0,0 +1 @@ +apt-get update && apt-get install -y wget unzip cmake build-essential gettext |