From 474230af88098453a4ee2d8b83416b9a20124dd9 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Fri, 4 Sep 2015 22:56:43 -0400 Subject: [PATCH 1/4] travis-ci explicitly set spec --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a8635c7..b3b21d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,15 +8,15 @@ git: matrix: include: - os: linux - env: CONFIG=release + env: SPEC=linux-g++-64 CONFIG=debug - os: linux - env: CONFIG=debug + env: SPEC=linux-g++-64 CONFIG=release - os: osx osx_image: beta-xcode6.3 - env: CONFIG=release + env: SPEC=macx-clang CONFIG=debug - os: osx osx_image: beta-xcode6.3 - env: CONFIG=debug + env: SPEC=macx-clang CONFIG=release cache: - apt @@ -50,7 +50,7 @@ install: fi -before_script: qmake CONFIG+=${CONFIG} -r qgroundcontrol.pro +before_script: qmake -r qgroundcontrol.pro CONFIG+=${CONFIG} -spec ${SPEC} script: - echo 'Building QGroundControl' && echo -en 'travis_fold:start:script.1\\r' - make -j4 From 8daee549ba7722d2886e824d0b2e155d9193a63d Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sat, 5 Sep 2015 00:13:00 -0400 Subject: [PATCH 2/4] travis-ci add CONFIG+=WarningsAsErrorsOn --- .travis.yml | 2 +- src/AutoPilotPlugins/PX4/RadioComponentController.cc | 6 +++--- src/VehicleSetup/FirmwareUpgradeController.cc | 2 +- src/VehicleSetup/JoystickConfigController.cc | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3b21d3..9b6acfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ install: fi -before_script: qmake -r qgroundcontrol.pro CONFIG+=${CONFIG} -spec ${SPEC} +before_script: qmake -r qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=WarningsAsErrorsOn -spec ${SPEC} script: - echo 'Building QGroundControl' && echo -en 'travis_fold:start:script.1\\r' - make -j4 diff --git a/src/AutoPilotPlugins/PX4/RadioComponentController.cc b/src/AutoPilotPlugins/PX4/RadioComponentController.cc index f18f205..e251c25 100644 --- a/src/AutoPilotPlugins/PX4/RadioComponentController.cc +++ b/src/AutoPilotPlugins/PX4/RadioComponentController.cc @@ -624,7 +624,7 @@ void RadioComponentController::_inputFlapsDetect(enum rcCalFunctions function, i void RadioComponentController::_resetInternalCalibrationValues(void) { // Set all raw channels to not reversed and center point values - for (size_t i=0; i<_chanMax; i++) { + for (int i=0; i<_chanMax; i++) { struct ChannelInfo* info = &_rgChannelInfo[i]; info->function = rcCalFunctionMax; info->reversed = false; @@ -673,7 +673,7 @@ void RadioComponentController::_setInternalCalibrationValuesFromParameters(void) { // Initialize all function mappings to not set - for (size_t i=0; i<_chanMax; i++) { + for (int i=0; i<_chanMax; i++) { struct ChannelInfo* info = &_rgChannelInfo[i]; info->function = rcCalFunctionMax; } @@ -865,7 +865,7 @@ void RadioComponentController::_stopCalibration(void) void RadioComponentController::_rcCalSaveCurrentValues(void) { qCDebug(RadioComponentControllerLog) << "_rcCalSaveCurrentValues"; - for (unsigned i = 0; i < _chanMax; i++) { + for (int i = 0; i < _chanMax; i++) { _rcValueSave[i] = _rcRawValue[i]; } } diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc index 66992cd..852c997 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -206,7 +206,7 @@ void FirmwareUpgradeController::_getFirmwareFile(FirmwareType_t firmwareType) // Select the firmware set based on board type const DownloadLocationByFirmwareType_t* prgFirmware; - size_t crgFirmware; + size_t crgFirmware = 0; switch (_bootloaderBoardID) { case Bootloader::boardIDPX4FMUV1: diff --git a/src/VehicleSetup/JoystickConfigController.cc b/src/VehicleSetup/JoystickConfigController.cc index 66942d2..41dc552 100644 --- a/src/VehicleSetup/JoystickConfigController.cc +++ b/src/VehicleSetup/JoystickConfigController.cc @@ -411,7 +411,7 @@ void JoystickConfigController::_inputCenterWait(Joystick::AxisFunction_t functio void JoystickConfigController::_resetInternalCalibrationValues(void) { // Set all raw axiss to not reversed and center point values - for (size_t i=0; i<_axisMax; i++) { + for (int i=0; i<_axisMax; i++) { struct AxisInfo* info = &_rgAxisInfo[i]; info->function = Joystick::maxFunction; info->reversed = false; @@ -435,7 +435,7 @@ void JoystickConfigController::_setInternalCalibrationValuesFromSettings(void) // Initialize all function mappings to not set - for (size_t i=0; i<_axisMax; i++) { + for (int i=0; i<_axisMax; i++) { struct AxisInfo* info = &_rgAxisInfo[i]; info->function = Joystick::maxFunction; } @@ -580,7 +580,7 @@ void JoystickConfigController::_stopCalibration(void) void JoystickConfigController::_calSaveCurrentValues(void) { qCDebug(JoystickConfigControllerLog) << "_calSaveCurrentValues"; - for (unsigned i = 0; i < _axisMax; i++) { + for (int i = 0; i < _axisMax; i++) { _axisValueSave[i] = _axisRawValue[i]; } } From 8365c185bf10e6f1aa41a1318f83e26b44fe204f Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sat, 5 Sep 2015 00:17:42 -0400 Subject: [PATCH 3/4] travis-ci osx remove extra qtlogging.ini --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b6acfa..f751897 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,9 +23,7 @@ cache: before_install: - cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow && git fetch --tags - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then mkdir -p $HOME/Library/Preferences/QtProject/ && echo "[Rules]\n *Log.debug=false" >> $HOME/Library/Preferences/QtProject/qtlogging.ini; fi - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/; fi - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/; fi + - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then mkdir -p $HOME/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/; fi install: - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then From 8b7a08d3baaeb7bbc8bba194d895c3b2baa7a6e7 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sat, 5 Sep 2015 00:47:52 -0400 Subject: [PATCH 4/4] travis-ci add installers --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index f751897..f234d8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,13 @@ matrix: - os: linux env: SPEC=linux-g++-64 CONFIG=debug - os: linux - env: SPEC=linux-g++-64 CONFIG=release + env: SPEC=linux-g++-64 CONFIG=installer - os: osx osx_image: beta-xcode6.3 env: SPEC=macx-clang CONFIG=debug - os: osx osx_image: beta-xcode6.3 - env: SPEC=macx-clang CONFIG=release + env: SPEC=macx-clang CONFIG=installer cache: - apt @@ -58,15 +58,15 @@ script: - if [[ "${TRAVIS_OS_NAME}" = "osx" && "${CONFIG}" = "debug" ]]; then ./debug/qgroundcontrol.app/Contents/MacOS/qgroundcontrol --unittest; fi - echo -en 'travis_fold:end:script.2\\r' -#deploy: -# provider: releases -# api-key: -# secure: "" -# file: "release/qgroundcontrol" -# skip_cleanup: true -# on: -# tags: true -# all_branches: true +deploy: + provider: releases + api-key: + secure: "" + file: "release/qgroundcontrol.dmg" + skip_cleanup: true + on: + tags: true + all_branches: true notifications: webhooks: