Procházet zdrojové kódy

Separate GUI config.

Daniel Buckmaster před 10 roky
rodič
revize
2416297b12

+ 14 - 1
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
 

+ 5 - 0
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

+ 0 - 6
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 \