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
7266988d
Commit
7266988d
authored
Jun 01, 2018
by
Peter Barker
Browse files
Vagrant: use Qt5.9.3 deps
parent
2a2dd107
Changes
2
Show whitespace changes
Inline
Side-by-side
.vagrantconfig.yml
View file @
7266988d
configs
:
configs
:
dev
:
dev
:
'
qt_deps_tarball'
:
'
Qt5.9.
1-linux-vagrant
.tar.bz2'
'
qt_deps_tarball'
:
'
Qt5.9.
3-gcc_64-min
.tar.bz2'
'
qt_deps_unpack_parent_dir'
:
'
/tmp'
'
qt_deps_unpack_parent_dir'
:
'
/tmp'
'
qt_deps_unpack_dir'
:
'
/tmp/Qt5.9-
vagrant
/5.9.
1
'
'
qt_deps_unpack_dir'
:
'
/tmp/Qt5.9-
gcc_64
/5.9.
3
'
'
qt_deps_bin_unpack_dir'
:
'
/tmp/Qt5.9-
vagrant
/5.9.
1
/gcc_64/bin'
'
qt_deps_bin_unpack_dir'
:
'
/tmp/Qt5.9-
gcc_64
/5.9.
3
/gcc_64/bin'
'
qt_deps_lib_unpack_dir'
:
'
/tmp/Qt5.9-
vagrant
/5.9.
1
/gcc_64/lib'
'
qt_deps_lib_unpack_dir'
:
'
/tmp/Qt5.9-
gcc_64
/5.9.
3
/gcc_64/lib'
'
qt_deps_plugins_unpack_dir'
:
'
/tmp/Qt5.9-
vagrant
/5.9.
1
/gcc_64/plugins'
'
qt_deps_plugins_unpack_dir'
:
'
/tmp/Qt5.9-
gcc_64
/5.9.
3
/gcc_64/plugins'
'
qt_deps_qml_unpack_dir'
:
'
/tmp/Qt5.9-
vagrant
/5.9.
1
/gcc_64/qml'
'
qt_deps_qml_unpack_dir'
:
'
/tmp/Qt5.9-
gcc_64
/5.9.
3
/gcc_64/qml'
'
project_root_dir'
:
'
/vagrant'
'
project_root_dir'
:
'
/vagrant'
...
@@ -20,4 +20,4 @@ configs:
...
@@ -20,4 +20,4 @@ configs:
'
spec'
:
'
linux-g++-64'
'
spec'
:
'
linux-g++-64'
'
shadow_build_dir'
:
'
/vagrant/shadow-build'
'
shadow_build_dir'
:
'
/vagrant/shadow-build'
'
pro'
:
'
/vagrant/qgroundcontrol.pro'
'
pro'
:
'
/vagrant/qgroundcontrol.pro'
'
deps_url'
:
'
https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.
1-linux-vagrant
.tar.bz2'
'
deps_url'
:
'
https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.
3-gcc_64-min
.tar.bz2'
Vagrantfile
View file @
7266988d
...
@@ -45,6 +45,7 @@ Vagrant.configure(2) do |config|
...
@@ -45,6 +45,7 @@ Vagrant.configure(2) do |config|
$config_shell
=
<<-
'SHELL'
$config_shell
=
<<-
'SHELL'
set -e
set -e
set -x
export %{build_env}
export %{build_env}
export JOBS=$((`cat /proc/cpuinfo | grep -c ^processor`+1))
export JOBS=$((`cat /proc/cpuinfo | grep -c ^processor`+1))
...
...
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