X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Vagrantfile;h=1abe8ff3b1dd43236ff4398818d1c37aa4e2bfa4;hb=08f31424634d5b614b69e3bb965ab50bdccd6d01;hp=e1082a08d030478fe7a41fc8884f4bdc8df107a3;hpb=ab7d6dca4106bae6876b46f06fe157478a62ecda;p=qmk_firmware.git

diff --git a/Vagrantfile b/Vagrantfile
index e1082a08d..1abe8ff3b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,15 +2,43 @@
 # vi: set ft=ruby :
 
 Vagrant.configure(2) do |config|
+  # You can only have one config.vm.box uncommented at a time
+
+  # Comment this and uncomment another if you don't want to use the minimal Arch box
   config.vm.box = "dragon788/arch-ala-elasticdog"
 
+  # VMware/Virtualbox 64 bit
+  # config.vm.box = "phusion/ubuntu-14.04-amd64"
+  #
+  # VMware/Virtualbox 64 bit
+  #config.vm.box = "puphpet/centos65-x64"
+  #
+  # The opensuse boxes don't have dfu-util in their default repositories
+  #
+  # The virtualbox version has tools issues
+  # VMware/Virtualbox 64 bit
+  #config.vm.box = "bento/opensuse-13.2-x86_64"
+  #
+  # Virtualbox only
+  #config.vm.box = "bento/opensuse-13.2-i386"
+  # config.vm.box = ""
+  # config.vm.box = ""
+
   # This section allows you to customize the Virtualbox VM
   # settings, ie showing the GUI or upping the memory
   # or cores if desired
   config.vm.provider "virtualbox" do |vb|
     # Hide the VirtualBox GUI when booting the machine
     vb.gui = false
-  
+    # Uncomment the below lines if you want to program
+    # your Teensy via the VM rather than your host OS
+    #vb.customize ['modifyvm', :id, '--usb', 'on']
+    #vb.customize ['usbfilter', 'add', '0',
+    #    	  '--target', :id,
+    #    	  '--name', 'teensy',
+    #    	  '--vendorid', '0x16c0',
+    #    	  '--productid','0x0478'
+    #		 ] 
     # Customize the amount of memory on the VM:
     vb.memory = "512"
   end
@@ -18,28 +46,43 @@ Vagrant.configure(2) do |config|
   # This section allows you to customize the VMware VM
   # settings, ie showing the GUI or upping the memory
   # or cores if desired
-  config.vm.provider "vmware" do |vmw|
+  config.vm.provider "vmware_workstation" do |vmw|
     # Hide the VMware GUI when booting the machine
-    vmw.gui = false
-  
+    vmw.gui = false 
+ 
     # Customize the amount of memory on the VM:
     vmw.memory = "512"
   end
 
-  # This ensures the system always gets the latest updates when powered on
+  config.vm.provider "vmware_fusion" do |vmf|
+    # Hide the vmfare GUI when booting the machine
+    vmf.gui = false
+ 
+    # Customize the amount of memory on the VM:
+    vmf.memory = "512"
+  end
+  
+  # This script ensures the required packages for AVR programming are installed
+  # It also ensures the system always gets the latest updates when powered on
   # If this causes issues you can run a 'vagrant destroy' and then
-  # comment out these three lines and run 'vagrant up' to get a working
-  # non-updated box and then attempt to troubleshoot after it has started
-  #
-  config.vm.provision "shell", run: "always", inline: <<-SHELL
-    sudo pacman -Syu --needed --noconfirm
-  SHELL
+  # add a # before ,args: and run 'vagrant up' to get a working
+  # non-updated box and then attempt to troubleshoot or open a Github issue 
   
-  # Allow user to speed up package installs using powerpill/wget tweaks
-  # Always run the pacman mirror update script if possible when vagrant comes up
-  # This will ensure that users never get stalled on a horribly slow mirror
+  config.vm.provision "shell", run: "always", path: "avr_setup.sh", args: "-update"
 
-  config.vm.provision "shell", path: "avr_setup.sh"
+  config.vm.post_up_message = """
+  Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win)
+  or 'vagrant ssh-config' and Putty or Bitvise SSH or another SSH tool
+
+  Change directory (cd) to the keyboard you wish to program 
+  (Optionally) modify your layout, 
+  then run 'make clean' 
+  and then 'make' to compile the .eep and .hex files.
+
+  Or you can copy and paste the example line below. 
+ 
+  cd /vagrant; cd keyboard; cd ergodox_ez; make clean; make
+  
 
-  config.vm.post_up_message = """Change directory to the keyboard you wish to program and modify your layout, then run 'make clean' and 'make' to compile the .eep and .hex files."""
+  """
 end