diff --git a/.vagrantconfig.yml b/.vagrantconfig.yml index 685571d83f374cc7de88c425d97a8f12bf47eedb..a72e6c6149778b7e7974d3f890af9f291835b83c 100644 --- a/.vagrantconfig.yml +++ b/.vagrantconfig.yml @@ -1,13 +1,13 @@ configs: dev: 'qt_deps_tarball': 'Qt5.11.0-gcc_64-min.tar.bz2' - 'qt_deps_unpack_parent_dir': '/tmp' + 'qt_deps_unpack_parent_dir': '/home/vagrant' - 'qt_deps_unpack_dir': '/tmp/Qt5.11-gcc_64/5.11.0' - 'qt_deps_bin_unpack_dir': '/tmp/Qt5.11-gcc_64/5.11.0/gcc_64/bin' - 'qt_deps_lib_unpack_dir': '/tmp/Qt5.11-gcc_64/5.11.0/gcc_64/lib' - 'qt_deps_plugins_unpack_dir': '/tmp/Qt5.11-gcc_64/5.11.0/gcc_64/plugins' - 'qt_deps_qml_unpack_dir': '/tmp/Qt5.11-gcc_64/5.11.0/gcc_64/qml' + 'qt_deps_unpack_dir': '/home/vagrant/Qt5.11-gcc_64/5.11.0' + 'qt_deps_bin_unpack_dir': '/home/vagrant/Qt5.11-gcc_64/5.11.0/gcc_64/bin' + 'qt_deps_lib_unpack_dir': '/home/vagrant/Qt5.11-gcc_64/5.11.0/gcc_64/lib' + 'qt_deps_plugins_unpack_dir': '/home/vagrant/Qt5.11-gcc_64/5.11.0/gcc_64/plugins' + 'qt_deps_qml_unpack_dir': '/home/vagrant/Qt5.11-gcc_64/5.11.0/gcc_64/qml' 'project_root_dir': '/vagrant' diff --git a/Vagrantfile b/Vagrantfile index c2c9c326ec006a5a7e819c92ed2a9dcfef53f840..1ef6fd3115161f5b07382c1b00e9ced14935d44b 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -20,13 +20,13 @@ Vagrant.configure(2) do |config| override.vm.box = "tknerr/baseimage-ubuntu-16.04" end config.vm.provider :virtualbox do |vb| - vb.customize ["modifyvm", :id, "--memory", "4096"] + vb.customize ["modifyvm", :id, "--memory", "6144"] vb.customize ["modifyvm", :id, "--cpus", "1"] vb.gui = true end ["vmware_fusion", "vmware_workstation"].each do |p| config.vm.provider p do |v| - v.vmx["memsize"] = "4096" + v.vmx["memsize"] = "6144" v.vmx["numvcpus"] = "1" v.gui = true end @@ -67,11 +67,38 @@ Vagrant.configure(2) do |config| su - vagrant -c 'rm -rf %{shadow_build_dir}' su - vagrant -c 'mkdir -p %{shadow_build_dir}' - su - vagrant -c "cd %{shadow_build_dir}; LD_LIBRARY_PATH=%{qt_deps_lib_unpack_dir} PATH=%{qt_deps_bin_unpack_dir}:\$PATH qmake -r %{pro} CONFIG+=\${CONFIG} CONFIG+=WarningsAsErrorsOn -spec %{spec}" - su - vagrant -c "cd %{shadow_build_dir}; LD_LIBRARY_PATH=%{qt_deps_lib_unpack_dir} PATH=%{qt_deps_bin_unpack_dir}:\$PATH make -j${JOBS}" - #su - vagrant -c 'mkdir -p %{shadow_build_dir}/release/package' - #su - vagrant -c 'cd %{project_root_dir}; ./deploy/create_linux_appimage.sh %{project_root_dir} %{shadow_build_dir}/release %{shadow_build_dir}/release/package' + # write out a pair of scripts to make rebuilding on the VM easy: + su - vagrant -c "cat <do-qmake.sh +#!/bin/bash + +set -e +set -x + +cd %{shadow_build_dir} +export LD_LIBRARY_PATH=%{qt_deps_lib_unpack_dir} +export PATH=%{qt_deps_bin_unpack_dir}:\$PATH +qmake -r %{pro} CONFIG+=\${CONFIG} CONFIG+=WarningsAsErrorsOn -spec %{spec} +QMAKE +" + + su - vagrant -c "cat <do-make.sh +#!/bin/bash + +set -e +set -x + +cd %{shadow_build_dir} +export LD_LIBRARY_PATH=%{qt_deps_lib_unpack_dir} +export PATH=%{qt_deps_bin_unpack_dir}:\$PATH +make -j${JOBS} +MAKE +" + su - vagrant -c "chmod +x do-qmake.sh do-make.sh" + + # now run the scripts: + su - vagrant -c ./do-qmake.sh + su - vagrant -c ./do-make.sh SHELL @@ -81,7 +108,7 @@ Vagrant.configure(2) do |config| :pro => yaml_config['pro'], :spec => yaml_config['spec'], :deps_url => yaml_config['deps_url'], - :apt_pkgs => (travisfile['addons']['apt']['packages']+['git', 'build-essential', 'fuse']).join(' '), + :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(' '), :project_root_dir => yaml_config['project_root_dir'],