From db06ffec7d143495fdc80a7ad2b90524ca50f784 Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Sun, 1 Feb 2015 21:22:05 +1100 Subject: [PATCH 01/10] Started to work on Vagrant configuration. --- Tools/Vagrant/Vagrantfile | 25 +++++++++++++++++++++++++ Tools/Vagrant/provision.sh | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 Tools/Vagrant/Vagrantfile create mode 100644 Tools/Vagrant/provision.sh diff --git a/Tools/Vagrant/Vagrantfile b/Tools/Vagrant/Vagrantfile new file mode 100644 index 000000000..40665a8c8 --- /dev/null +++ b/Tools/Vagrant/Vagrantfile @@ -0,0 +1,25 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! +VAGRANTFILE_API_VERSION = '2' + +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + config.vm.box = 'ubuntu/trusty32' + + config.vm.provider 'virtualbox' do |vb| + vb.gui = true + vb.memory = 1024 + end + + config.vm.synced_folder '../../', '/torque' + + config.vm.provision :shell, path: 'provision.sh' + + # config.vm.network 'forwarded_port', guest: 80, host: 8080 + + # More info at http://fgrehm.viewdocs.io/vagrant-cachier/usage + if Vagrant.has_plugin?("vagrant-cachier") + config.cache.scope = :box + end +end diff --git a/Tools/Vagrant/provision.sh b/Tools/Vagrant/provision.sh new file mode 100644 index 000000000..016ee8a93 --- /dev/null +++ b/Tools/Vagrant/provision.sh @@ -0,0 +1,38 @@ +# Make sure package listings are up to date. +apt-get update -y + +# Install Unity desktop for GUI purposes. +apt-get install -y --no-install-recommends ubuntu-desktop + +# Install software for development. +apt-get install \ + terminal \ + git \ + -y + +# Install Torque-specific binaries. +sudo apt-get install \ + build-essential \ + nasm \ + xorg-dev \ + ninja-build \ + gcc-multilib \ + g++-multilib \ + cmake \ + cmake-qt-gui \ + --ignore-missing -y + +# Install libraries. +sudo apt-get install \ + libogg-dev \ + libxft-dev \ + libx11-dev \ + libxxf86vm-dev \ + libopenal-dev \ + libfreetype6-dev \ + libxcursor-dev \ + libxinerama-dev \ + libxi-dev \ + libxrandr-dev \ + libxss-dev \ + --ignore-missing -y From 05fba1f110199c4badac2910649229854f6049f1 Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Sun, 1 Feb 2015 22:01:12 +1100 Subject: [PATCH 02/10] Reorganised. --- Tools/Vagrant/Vagrantfile | 2 +- Tools/Vagrant/provision.sh | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Tools/Vagrant/Vagrantfile b/Tools/Vagrant/Vagrantfile index 40665a8c8..850ace5ed 100644 --- a/Tools/Vagrant/Vagrantfile +++ b/Tools/Vagrant/Vagrantfile @@ -19,7 +19,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # config.vm.network 'forwarded_port', guest: 80, host: 8080 # More info at http://fgrehm.viewdocs.io/vagrant-cachier/usage - if Vagrant.has_plugin?("vagrant-cachier") + if Vagrant.has_plugin?('vagrant-cachier') config.cache.scope = :box end end diff --git a/Tools/Vagrant/provision.sh b/Tools/Vagrant/provision.sh index 016ee8a93..2d3012cca 100644 --- a/Tools/Vagrant/provision.sh +++ b/Tools/Vagrant/provision.sh @@ -5,22 +5,18 @@ apt-get update -y apt-get install -y --no-install-recommends ubuntu-desktop # Install software for development. -apt-get install \ - terminal \ - git \ - -y - -# Install Torque-specific binaries. sudo apt-get install \ + git \ + terminal \ build-essential \ nasm \ + cmake \ + cmake-qt-gui \ xorg-dev \ ninja-build \ gcc-multilib \ g++-multilib \ - cmake \ - cmake-qt-gui \ - --ignore-missing -y + -y # Install libraries. sudo apt-get install \ @@ -35,4 +31,4 @@ sudo apt-get install \ libxi-dev \ libxrandr-dev \ libxss-dev \ - --ignore-missing -y + -y From abea882862b7617d5a84a0f5ea6c65e323f7aef9 Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Mon, 2 Feb 2015 17:06:48 +1100 Subject: [PATCH 03/10] No GUI mode for now. --- Tools/Vagrant/Vagrantfile | 2 +- Tools/Vagrant/provision.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/Vagrant/Vagrantfile b/Tools/Vagrant/Vagrantfile index 850ace5ed..af5f3ca2d 100644 --- a/Tools/Vagrant/Vagrantfile +++ b/Tools/Vagrant/Vagrantfile @@ -8,7 +8,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.box = 'ubuntu/trusty32' config.vm.provider 'virtualbox' do |vb| - vb.gui = true + #vb.gui = true vb.memory = 1024 end diff --git a/Tools/Vagrant/provision.sh b/Tools/Vagrant/provision.sh index 2d3012cca..1b602c819 100644 --- a/Tools/Vagrant/provision.sh +++ b/Tools/Vagrant/provision.sh @@ -2,7 +2,7 @@ apt-get update -y # Install Unity desktop for GUI purposes. -apt-get install -y --no-install-recommends ubuntu-desktop +#apt-get install -y --no-install-recommends ubuntu-desktop # Install software for development. sudo apt-get install \ From d6ce1c3601a591bc390fba9fde0ec9241e7d773c Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Mon, 2 Feb 2015 17:07:06 +1100 Subject: [PATCH 04/10] Does not exist. --- Tools/Vagrant/provision.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Tools/Vagrant/provision.sh b/Tools/Vagrant/provision.sh index 1b602c819..7874214e5 100644 --- a/Tools/Vagrant/provision.sh +++ b/Tools/Vagrant/provision.sh @@ -7,7 +7,6 @@ apt-get update -y # Install software for development. sudo apt-get install \ git \ - terminal \ build-essential \ nasm \ cmake \ From f01596554a044b76e03f05ec9814e5a3dd9c8481 Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Mon, 2 Feb 2015 17:07:12 +1100 Subject: [PATCH 05/10] Discovered a new dependency. --- Tools/Vagrant/provision.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Tools/Vagrant/provision.sh b/Tools/Vagrant/provision.sh index 7874214e5..c2b0425dd 100644 --- a/Tools/Vagrant/provision.sh +++ b/Tools/Vagrant/provision.sh @@ -30,4 +30,5 @@ sudo apt-get install \ libxi-dev \ libxrandr-dev \ libxss-dev \ + libglu1-mesa-dev \ -y From 877aadd68e0289140153619248f2c0e993bb565e Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Sat, 7 Feb 2015 13:20:10 +1100 Subject: [PATCH 06/10] 64-bit is more common and works fine. --- Tools/Vagrant/Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/Vagrant/Vagrantfile b/Tools/Vagrant/Vagrantfile index af5f3ca2d..5614abbe1 100644 --- a/Tools/Vagrant/Vagrantfile +++ b/Tools/Vagrant/Vagrantfile @@ -5,7 +5,7 @@ VAGRANTFILE_API_VERSION = '2' Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = 'ubuntu/trusty32' + config.vm.box = 'ubuntu/trusty64' config.vm.provider 'virtualbox' do |vb| #vb.gui = true From 2c0b941b3176523315bbd6902aa8d0b69a18bac5 Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Sat, 7 Feb 2015 13:20:23 +1100 Subject: [PATCH 07/10] Formatting. --- Tools/Vagrant/provision.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tools/Vagrant/provision.sh b/Tools/Vagrant/provision.sh index c2b0425dd..ed551091c 100644 --- a/Tools/Vagrant/provision.sh +++ b/Tools/Vagrant/provision.sh @@ -2,7 +2,10 @@ apt-get update -y # Install Unity desktop for GUI purposes. -#apt-get install -y --no-install-recommends ubuntu-desktop +#apt-get install --no-install-recommends \ +# ubuntu-desktop \ +# gnome-terminal \ +# -y # Install software for development. sudo apt-get install \ From 7d3a76ab13c5ca3295e18e0caeec0b83d5cd9aa1 Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Sat, 7 Feb 2015 13:20:45 +1100 Subject: [PATCH 08/10] Start to work on Vagrant readme. --- Tools/Vagrant/README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Tools/Vagrant/README.md diff --git a/Tools/Vagrant/README.md b/Tools/Vagrant/README.md new file mode 100644 index 000000000..9619c5c8b --- /dev/null +++ b/Tools/Vagrant/README.md @@ -0,0 +1,12 @@ +# Torque 3D Vagrant config + +## What is Vagrant? + +Vagrant is a command-line application that helps you manage virtual machines. +It allows you to write script files that describe a virtual machine, and then execute those scripts to create it. + +## Setup on Windows + +## Setup on Ubuntu + +## Building Torque From 7252c697383384af6d72b600e558f64e50d8352e Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Sat, 7 Feb 2015 14:27:10 +1100 Subject: [PATCH 09/10] Readme will be replaced by wiki tutorial. --- Tools/Vagrant/README.md | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 Tools/Vagrant/README.md diff --git a/Tools/Vagrant/README.md b/Tools/Vagrant/README.md deleted file mode 100644 index 9619c5c8b..000000000 --- a/Tools/Vagrant/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# Torque 3D Vagrant config - -## What is Vagrant? - -Vagrant is a command-line application that helps you manage virtual machines. -It allows you to write script files that describe a virtual machine, and then execute those scripts to create it. - -## Setup on Windows - -## Setup on Ubuntu - -## Building Torque From 2416297b128fa787591c08a6e2a74821af226433 Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Sat, 7 Feb 2015 17:03:04 +1100 Subject: [PATCH 10/10] Separate GUI config. --- Tools/Vagrant/Vagrantfile | 15 ++++++++++++++- Tools/Vagrant/provision-gui.sh | 5 +++++ Tools/Vagrant/provision.sh | 6 ------ 3 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 Tools/Vagrant/provision-gui.sh diff --git a/Tools/Vagrant/Vagrantfile b/Tools/Vagrant/Vagrantfile index 5614abbe1..8c6d0f381 100644 --- a/Tools/Vagrant/Vagrantfile +++ b/Tools/Vagrant/Vagrantfile @@ -1,6 +1,10 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +def gui? + !ENV.fetch('GUI', '').empty? +end + # Vagrantfile API/syntax version. Don't touch unless you know what you're doing! VAGRANTFILE_API_VERSION = '2' @@ -8,13 +12,22 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.box = 'ubuntu/trusty64' config.vm.provider 'virtualbox' do |vb| - #vb.gui = true vb.memory = 1024 + if gui? + vb.memory = 2048 + vb.customize ['modifyvm', :id, '--vram', '256'] + vb.customize ['modifyvm', :id, '--accelerate3d', 'on'] + vb.customize ['modifyvm', :id, '--hwvirtex', 'on'] + vb.gui = true + end end config.vm.synced_folder '../../', '/torque' config.vm.provision :shell, path: 'provision.sh' + if gui? + config.vm.provision :shell, path: 'provision-gui.sh' + end # config.vm.network 'forwarded_port', guest: 80, host: 8080 diff --git a/Tools/Vagrant/provision-gui.sh b/Tools/Vagrant/provision-gui.sh new file mode 100644 index 000000000..36ab028a7 --- /dev/null +++ b/Tools/Vagrant/provision-gui.sh @@ -0,0 +1,5 @@ +# Install Unity desktop for GUI purposes. +apt-get install --no-install-recommends \ + ubuntu-desktop \ + gnome-terminal \ + -y diff --git a/Tools/Vagrant/provision.sh b/Tools/Vagrant/provision.sh index ed551091c..cec4b6938 100644 --- a/Tools/Vagrant/provision.sh +++ b/Tools/Vagrant/provision.sh @@ -1,12 +1,6 @@ # Make sure package listings are up to date. apt-get update -y -# Install Unity desktop for GUI purposes. -#apt-get install --no-install-recommends \ -# ubuntu-desktop \ -# gnome-terminal \ -# -y - # Install software for development. sudo apt-get install \ git \