From 4f8400e3954127458ec0d613c771faca068390aa Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 20 Oct 2021 12:57:07 +1100 Subject: [PATCH] Vagrant: use aqt to install qt deps rather than using tarball --- .vagrantconfig.yml | 12 +++++------- Vagrantfile | 22 +++++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.vagrantconfig.yml b/.vagrantconfig.yml index 1dbdf12..b08e36d 100644 --- a/.vagrantconfig.yml +++ b/.vagrantconfig.yml @@ -1,13 +1,12 @@ configs: dev: - 'qt_deps_tarball': 'Qt5.12.6-gcc_64-min.tar.bz2' 'qt_deps_unpack_parent_dir': '/home/vagrant' - 'qt_deps_unpack_dir': '/home/vagrant/Qt5.12-gcc_64/5.12.6' - 'qt_deps_bin_unpack_dir': '/home/vagrant/Qt5.12-gcc_64/5.12.6/gcc_64/bin' - 'qt_deps_lib_unpack_dir': '/home/vagrant/Qt5.12-gcc_64/5.12.6/gcc_64/lib' - 'qt_deps_plugins_unpack_dir': '/home/vagrant/Qt5.12-gcc_64/5.12.6/gcc_64/plugins' - 'qt_deps_qml_unpack_dir': '/home/vagrant/Qt5.12-gcc_64/5.12.6/gcc_64/qml' + 'qt_deps_unpack_dir': '/home/vagrant/Qt' + 'qt_deps_bin_unpack_dir': '/home/vagrant/Qt/5.15.2/gcc_64/bin' + 'qt_deps_lib_unpack_dir': '/home/vagrant/Qt/5.15.2/gcc_64/lib' + 'qt_deps_plugins_unpack_dir': '/home/vagrant/Qt/5.15.2/gcc_64/plugins' + 'qt_deps_qml_unpack_dir': '/home/vagrant/Qt/5.15.2/gcc_64/qml' 'project_root_dir': '/vagrant' @@ -20,4 +19,3 @@ configs: 'spec': 'linux-g++-64' 'shadow_build_dir': '/vagrant/shadow-build' 'pro': '/vagrant/qgroundcontrol.pro' - 'deps_url': 'https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.12.6-gcc_64-min.tar.bz2' diff --git a/Vagrantfile b/Vagrantfile index b2ae154..4b41ae5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -59,14 +59,19 @@ Vagrant.configure(2) do |config| echo 'Initialising submodules' su - vagrant -c 'cd %{project_root_dir}; git submodule init && git submodule update' - echo 'Saving %{qt_deps_tarball} from %{deps_url} to %{project_root_dir}' - su - vagrant -c 'wget --continue -q %{deps_url} -P %{project_root_dir}' - su - vagrant -c 'rm -rf %{qt_deps_unpack_dir}' - su - vagrant -c 'mkdir -p %{qt_deps_unpack_parent_dir}' - su - vagrant -c 'cd %{project_root_dir}; tar jxf "%{qt_deps_tarball}" -C %{qt_deps_unpack_parent_dir}' - su - vagrant -c 'rm -rf %{shadow_build_dir}' - - su - vagrant -c 'mkdir -p %{shadow_build_dir}' + # with reference to https://github.com/jurplel/install-qt-action/blob/master/src/main.ts and .github/workflows/linux_release.yml: + echo 'Installing QT' + apt-get install -y python3-pip + su - vagrant -c "pip3 install --user aqtinstall" + + dir="%{qt_deps_unpack_dir}" + version="5.15.2" + host="linux" + target="desktop" + modules="qtcharts" + su - vagrant -c "rm -rf ${dir}" + su - vagrant -c "mkdir -p ${dir}" + su - vagrant -c "python3 -m aqt install-qt -O ${dir} ${host} ${target} ${version} -m ${modules}" # write out a pair of scripts to make rebuilding on the VM easy: su - vagrant -c "cat <do-qmake.sh @@ -107,7 +112,6 @@ MAKE :qt_deps_tarball => yaml_config['qt_deps_tarball'], :pro => yaml_config['pro'], :spec => yaml_config['spec'], - :deps_url => yaml_config['deps_url'], :apt_pkgs => (travisfile['addons']['apt']['packages']+['git', 'build-essential', 'fuse', 'libsdl2-dev']).join(' '), :build_env => travisfile['env']['global'].select { |item| item.is_a?(String) }.join(' '),