Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
09493831
Commit
09493831
authored
Jul 09, 2016
by
Daniel Agar
Committed by
GitHub
Jul 09, 2016
Browse files
Merge pull request #3759 from dagar/build_misc
parents
fe9969a8
bce7c0d6
Changes
5
Hide whitespace changes
Inline
Side-by-side
.appveyor.yml
View file @
09493831
...
...
@@ -66,6 +66,7 @@ artifacts:
name
:
symbols
deploy
:
# deploy continuous builds to s3
-
provider
:
S3
access_key_id
:
secure
:
IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
...
...
@@ -77,6 +78,7 @@ deploy:
artifact
:
qgcinstaller
on
:
CONFIG
:
installer
# deploy daily build symbols to s3
-
provider
:
S3
access_key_id
:
secure
:
IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
...
...
@@ -89,6 +91,7 @@ deploy:
on
:
CONFIG
:
installer
appveyor_repo_tag
:
false
# deploy release symbols to s3
-
provider
:
S3
access_key_id
:
secure
:
IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
...
...
@@ -101,6 +104,7 @@ deploy:
on
:
CONFIG
:
installer
appveyor_repo_tag
:
true
# deploy tagged releases to Github releases
-
provider
:
GitHub
auth_token
:
secure
:
dzWLqd0eTKjrAWC5LgqVnwLemmrNdddGA2ZZn/OthAP37mwCLkP2C1zil7ivmEE8
...
...
@@ -110,3 +114,29 @@ deploy:
on
:
CONFIG
:
installer
appveyor_repo_tag
:
true
# deploy tagged releases to s3 version folder
-
provider
:
S3
access_key_id
:
secure
:
IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
secret_access_key
:
secure
:
RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
bucket
:
qgroundcontrol
set_public
:
true
folder
:
$(APPVEYOR_REPO_TAG)
artifact
:
qgcinstaller
on
:
CONFIG
:
installer
appveyor_repo_tag
:
true
# deploy tagged releases to s3 latest folder
-
provider
:
S3
access_key_id
:
secure
:
IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
secret_access_key
:
secure
:
RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
bucket
:
qgroundcontrol
set_public
:
true
folder
:
latest
artifact
:
qgcinstaller
on
:
CONFIG
:
installer
appveyor_repo_tag
:
true
.travis.yml
View file @
09493831
...
...
@@ -76,7 +76,7 @@ before_install:
fi
# setup ccache
-
ccache -M 500MB && ccache -z
#
- ccache -M 500MB && ccache -z
# compile threads
-
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
...
...
@@ -167,15 +167,15 @@ script:
else
xcodebuild -IDEBuildOperationMaxNumberOfConcurrentCompileTasks=$JOBS -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c && $(exit ${PIPESTATUS[0]});
fi
-
ccache -s
#
- ccache -s
# unit tests linux/osx
-
if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then
mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ &&
debug/
qg
round
c
ontrol --unittest;
./
debug/
QG
round
C
ontrol --unittest;
elif [[ "${SPEC}" = "macx-clang" && "${CONFIG}" = "debug" ]]; then
mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/ &&
debug/qgroundcontrol.app/Contents/MacOS/
qg
round
c
ontrol --unittest;
./
debug/qgroundcontrol.app/Contents/MacOS/
QG
round
C
ontrol --unittest;
fi
after_success
:
...
...
@@ -192,7 +192,7 @@ after_success:
pip install --user google-api-python-client PyOpenSSL &&
echo "Google Play Track:" ${GOOGLE_PLAY_TRACK} &&
openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in android/Google_Play_Android_Developer-4432a3c4f5d1.json.enc -out android/Google_Play_Android_Developer-4432a3c4f5d1.json -d &&
tools/google_play_upload.py ${GOOGLE_PLAY_TRACK} org.mavlink.qgroundcontrol ${SHADOW_BUILD_DIR}/release/package/
qg
round
c
ontrol.apk
tools/google_play_upload.py ${GOOGLE_PLAY_TRACK} org.mavlink.qgroundcontrol ${SHADOW_BUILD_DIR}/release/package/
QG
round
C
ontrol.apk
;
fi
...
...
@@ -204,7 +204,7 @@ before_deploy:
fi
deploy
:
#
u
plo
ad
installers to s3 if on a branch
#
de
plo
y
installers to s3
builds/
if on a branch
-
provider
:
s3
access_key_id
:
AKIAIVORNALE7NHD3T6Q
secret_access_key
:
...
...
@@ -219,6 +219,36 @@ deploy:
all_branches
:
true
condition
:
$CONFIG = installer
# deploy installers to s3 latest/ if on a tag
-
provider
:
s3
access_key_id
:
AKIAIVORNALE7NHD3T6Q
secret_access_key
:
secure
:
BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4=
bucket
:
qgroundcontrol
local_dir
:
${SHADOW_BUILD_DIR}/release/package
upload-dir
:
latest
acl
:
public_read
region
:
us-west-2
skip_cleanup
:
true
on
:
tags
:
true
condition
:
$CONFIG = installer
# deploy tagged installers to s3 version folder
-
provider
:
s3
access_key_id
:
AKIAIVORNALE7NHD3T6Q
secret_access_key
:
secure
:
BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4=
bucket
:
qgroundcontrol
local_dir
:
${SHADOW_BUILD_DIR}/release/package
upload-dir
:
builds/${TRAVIS_BRANCH}
acl
:
public_read
region
:
us-west-2
skip_cleanup
:
true
on
:
tags
:
true
condition
:
$CONFIG = installer
# deploy installers to Github releases if on a tag
-
provider
:
releases
api-key
:
...
...
deploy/qgroundcontrol-start.sh
View file @
09493831
...
...
@@ -7,4 +7,4 @@ export QT_PLUGIN_PATH="${HERE}/Qt/plugins"
# hack until icon issue with AppImage is resolved
mkdir
-p
~/.icons
&&
cp
${
HERE
}
/qgroundcontrol.png ~/.icons
"
${
HERE
}
/
qg
round
c
ontrol"
"
$@
"
"
${
HERE
}
/
QG
round
C
ontrol"
"
$@
"
qgroundcontrol.pro
View file @
09493831
...
...
@@ -19,7 +19,7 @@ message(Qt version $$[QT_VERSION])
include
(
QGCCommon
.
pri
)
TARGET
=
qg
round
c
ontrol
TARGET
=
QG
round
C
ontrol
TEMPLATE
=
app
DebugBuild
{
...
...
@@ -140,7 +140,7 @@ RC_ICONS = resources/icons/qgroundcontrol.ico
QMAKE_TARGET_COMPANY = "
qgroundcontrol
.
org
"
QMAKE_TARGET_DESCRIPTION = "
Open
source
ground
control
app
provided
by
QGroundControl
dev
team
"
QMAKE_TARGET_COPYRIGHT = "
Copyright
(
C
)
2016
QGroundControl
Development
Team
.
All
rights
reserved
.
"
QMAKE_TARGET_PRODUCT = "
qg
round
c
ontrol
"
QMAKE_TARGET_PRODUCT = "
QG
round
C
ontrol
"
#
# Build-specific settings
...
...
tools/google_play_upload.py
View file @
09493831
...
...
@@ -33,7 +33,7 @@ argparser.add_argument('release_track',
argparser
.
add_argument
(
'package_name'
,
help
=
'The package name. Example: com.android.sample'
)
argparser
.
add_argument
(
'apk_file'
,
default
=
'
qg
round
c
ontrol.apk'
,
default
=
'
QG
round
C
ontrol.apk'
,
help
=
'The path to the APK file to upload.'
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment