From 063e2c7ebdc1771de1bc7da7012ab2e2d6041540 Mon Sep 17 00:00:00 2001 From: Pierre GRANDIN Date: Tue, 5 Sep 2017 10:07:06 -0700 Subject: Upgrade to CircleCI v2 (#310) * Switching to circleci v2 * Only build for Linux for now * Sudo is not required anymore * Update before installing packages * Cope with non interactive terminals * Use ci's working_directory * Fixed typo * Disable QT5 for now * Build for more platforms * Fixed workflow definition * sudo is not required anymore * Update before installing * Install wget when building for tomtom * Revert to 14.04 base image * Install unzip for build_tomtom_* * Install wget for build_android_* * Install wget for build_android_* * Install cmake for win32 build * Install gettext for the win32 build * Install build-essential for tomtom builds * Setup common requirements * Install packages to build tt environment install packages need to build tt environment correct navit path remove arm-genmarshal which disturbing a second build run * Splitting the tomtom builds into more steps * Splitting the tomtom builds into more steps * Working on the tomtom minimal build * Fixed some paths issues for tomtom_minimal * Added missing exports for tomtom_minimal * Added missing tomtom requirements * Save the result of the tomtom_minimal build * Fixing the tomtom plugin build for CI v2 * Fixed job name misconfiguration * Use less relative paths * Fixed espeakdsp.c path * Adding tomtom assets * Removed superfluous popd * Fixed contrib path * Adding tomtom assets * Compile espeakdsp directly to the correct path * Compile espeakdsp directly to the correct path * Compile espeakdsp directly to the correct path * Recursively copy contrib/tomtom assets * Fixed tomtom specific icons path * Preparing the android ARM build for CI v2 * Adapting build path * Added missing packages for android builds * Updating android x86 scripts for ci v2 * Android-25 will require jdk-8 * Install openjdk-8 for Ubuntu 14.04 * Ensures that add-apt is available for android builds * Cope with non interactive terminals * Ensures that openjdk-7 isn't installed * Updated artifacts for ci v2 / android arm * Fixed apk path for ci_v2 * Fixed leftovers path for ci_v2 * Fixed artifacts path for android arm * Fixed typos * Fixed toolchain misconfiguration * Specify android's api/nkd api versions * Fixed apk path for ci_v2 * Store android/x86 artifacts --- Toolchain/arm-eabi.cmake | 6 +++--- Toolchain/i686-android.cmake | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Toolchain') diff --git a/Toolchain/arm-eabi.cmake b/Toolchain/arm-eabi.cmake index 7c8190667..5aec27692 100755 --- a/Toolchain/arm-eabi.cmake +++ b/Toolchain/arm-eabi.cmake @@ -1,8 +1,8 @@ set(CMAKE_SYSTEM_NAME GNU) set(ANDROID TRUE) -set(ANDROID_API_VERSION 9 CACHE STRING "Andriod API Version") -set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Andriod NDK API Version") +set(ANDROID_API_VERSION 9 CACHE STRING "Android API Version") +set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Android NDK API Version") set(ANDROID_ARCH "armeabi" CACHE STRING "Android architecture") find_program(CMAKE_C_COMPILER NAMES arm-eabi-gcc arm-eabi-gcc.exe arm-linux-androideabi-gcc arm-linux-androideabi-gcc.exe) @@ -11,7 +11,7 @@ set(PKG_CONFIG_EXECUTABLE "arm-eabi-pkg-config") get_filename_component(COMPILER_PATH ${CMAKE_C_COMPILER} PATH) -set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Andriod NDK") +set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Android NDK") set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_NDK_API_VERSION}/arch-arm") set(CMAKE_FIND_ROOT_PATH ${NDK_ARCH_DIR}) diff --git a/Toolchain/i686-android.cmake b/Toolchain/i686-android.cmake index 2b6e8a177..4f5630644 100755 --- a/Toolchain/i686-android.cmake +++ b/Toolchain/i686-android.cmake @@ -1,8 +1,8 @@ set(CMAKE_SYSTEM_NAME GNU) set(ANDROID TRUE) -set(ANDROID_API_VERSION 9 CACHE STRING "Andriod API Version") -set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Andriod NDK API Version") +set(ANDROID_API_VERSION 9 CACHE STRING "Android API Version") +set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Android NDK API Version") set(ANDROID_ARCH "x86" CACHE STRING "Android architecture") find_program(CMAKE_C_COMPILER NAMES i686-linux-android-gcc i686-linux-android-gcc.exe) @@ -11,7 +11,7 @@ set(PKG_CONFIG_EXECUTABLE "i686-android-pkg-config") get_filename_component(COMPILER_PATH ${CMAKE_C_COMPILER} PATH) -set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Andriod NDK") +set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Android NDK") set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_NDK_API_VERSION}/arch-x86") set(CMAKE_FIND_ROOT_PATH ${NDK_ARCH_DIR}) -- cgit v1.2.1