Commit bee5eb8e authored by Don Gagne's avatar Don Gagne

Merge pull request #3034 from DonLakeFlyer/iosTravisRelease

Add iOS release builds
parents d809c792 894a5d3c
...@@ -25,6 +25,9 @@ matrix: ...@@ -25,6 +25,9 @@ matrix:
- os: osx - os: osx
osx_image: xcode7 osx_image: xcode7
env: SPEC=macx-clang CONFIG=installer SHADOW_BUILD_DIR=/tmp/build_macos_install env: SPEC=macx-clang CONFIG=installer SHADOW_BUILD_DIR=/tmp/build_macos_install
- os: osx
osx_image: xcode7
env: SPEC=ios SHADOW_BUILD_DIR=/tmp/build_ios
# - os: android # - os: android
# language: android # language: android
# env: SPEC=android-g++ CONFIG=debug SHADOW_BUILD_DIR=/tmp/build_android_debug # env: SPEC=android-g++ CONFIG=debug SHADOW_BUILD_DIR=/tmp/build_android_debug
...@@ -82,12 +85,18 @@ install: ...@@ -82,12 +85,18 @@ install:
&& export DISPLAY=:99.0 && export DISPLAY=:99.0
&& sh -e /etc/init.d/xvfb start && sh -e /etc/init.d/xvfb start
; ;
elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then elif [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" != "ios" ]]; then
brew update; brew update;
brew update brew update
&& brew install qt5 && brew install qt5
&& export PATH=/usr/local/opt/qt5/bin:$PATH && export PATH=/usr/local/opt/qt5/bin:$PATH
; ;
elif [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" = "ios" ]]; then
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-ios.tar.bz2
&& mkdir -p ~/qt-ios
&& tar jxf Qt5.5.1-ios.tar.bz2 -C ~/qt-ios
&& export PATH=~/qt-ios/ios/bin:$PATH
;
elif [ "${TRAVIS_OS_NAME}" = "android" ]; then elif [ "${TRAVIS_OS_NAME}" = "android" ]; then
wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin
&& chmod +x android-ndk-r10e-linux-x86_64.bin && chmod +x android-ndk-r10e-linux-x86_64.bin
...@@ -111,12 +120,14 @@ before_script: ...@@ -111,12 +120,14 @@ before_script:
- ln -s /usr/bin/ccache ~/bin/gcc-4.8 - ln -s /usr/bin/ccache ~/bin/gcc-4.8
- export PATH=~/bin:$PATH - export PATH=~/bin:$PATH
- if [[ "${TRAVIS_OS_NAME}" = "android" && "${CONFIG}" = "installer" && -z ${ANDROID_STOREPASS} ]]; then export CONFIG=release; fi - if [[ "${TRAVIS_OS_NAME}" = "android" && "${CONFIG}" = "installer" && -z ${ANDROID_STOREPASS} ]]; then export CONFIG=release; fi
- if [ "${CONFIG}" != "doxygen" ]; then mkdir ${SHADOW_BUILD_DIR} && cd ${SHADOW_BUILD_DIR} && qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=WarningsAsErrorsOn -spec ${SPEC}; fi - if [[ "${CONFIG}" != "doxygen" && "${SPEC}" != "ios" ]]; then mkdir ${SHADOW_BUILD_DIR} && cd ${SHADOW_BUILD_DIR} && qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=WarningsAsErrorsOn -spec ${SPEC}; fi
- if [ "${SPEC}" = "ios" ]; then mkdir ${SHADOW_BUILD_DIR} && cd ${SHADOW_BUILD_DIR} && qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=WarningsAsErrorsOn CONFIG-=debug_and_release CONFIG+=release; fi
script: script:
- if [ "${TRAVIS_OS_NAME}" = "android" ]; then cd ${TRAVIS_BUILD_DIR} && ./tools/update_android_version.sh; fi - if [ "${TRAVIS_OS_NAME}" = "android" ]; then cd ${TRAVIS_BUILD_DIR} && ./tools/update_android_version.sh; fi
- echo 'Building QGroundControl' && echo -en 'travis_fold:start:script.1\\r' - echo 'Building QGroundControl' && echo -en 'travis_fold:start:script.1\\r'
- if [ "${CONFIG}" != "doxygen" ]; then cd ${SHADOW_BUILD_DIR} && make -j4; fi - if [[ "${CONFIG}" != "doxygen" && "${SPEC}" != "ios" ]]; then cd ${SHADOW_BUILD_DIR} && make -j4; fi
- if [ "${SPEC}" = "ios" ]; then cd ${SHADOW_BUILD_DIR} && xcodebuild -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO; fi
- if [ "${CONFIG}" = "doxygen" ]; then cd ${TRAVIS_BUILD_DIR}/src && doxygen documentation.dox; fi - if [ "${CONFIG}" = "doxygen" ]; then cd ${TRAVIS_BUILD_DIR}/src && doxygen documentation.dox; fi
- echo -en 'travis_fold:end:script.1\\r' - echo -en 'travis_fold:end:script.1\\r'
- if [[ "${TRAVIS_OS_NAME}" = "linux" && "${CONFIG}" = "debug" ]]; then ${SHADOW_BUILD_DIR}/debug/qgroundcontrol --unittest; fi - if [[ "${TRAVIS_OS_NAME}" = "linux" && "${CONFIG}" = "debug" ]]; then ${SHADOW_BUILD_DIR}/debug/qgroundcontrol --unittest; fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment