diff options
| -rw-r--r-- | Vagrantfile | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/Vagrantfile b/Vagrantfile index 389b688ae..08de5f7f5 100644 --- a/Vagrantfile +++ b/Vagrantfile | |||
| @@ -2,27 +2,8 @@ | |||
| 2 | # vi: set ft=ruby : | 2 | # vi: set ft=ruby : |
| 3 | 3 | ||
| 4 | Vagrant.configure(2) do |config| | 4 | Vagrant.configure(2) do |config| |
| 5 | # You can only have one config.vm.box uncommented at a time | ||
| 6 | |||
| 7 | # Comment this and uncomment another if you don't want to use the minimal Arch box | ||
| 8 | #config.vm.box = "dragon788/arch-ala-elasticdog" | ||
| 9 | |||
| 10 | # VMware/Virtualbox 64 bit | 5 | # VMware/Virtualbox 64 bit |
| 11 | config.vm.box = "phusion/ubuntu-14.04-amd64" | 6 | config.vm.box = "phusion/ubuntu-14.04-amd64" |
| 12 | # | ||
| 13 | # VMware/Virtualbox 64 bit | ||
| 14 | #config.vm.box = "puphpet/centos65-x64" | ||
| 15 | # | ||
| 16 | # The opensuse boxes don't have dfu-util in their default repositories | ||
| 17 | # | ||
| 18 | # The virtualbox version has tools issues | ||
| 19 | # VMware/Virtualbox 64 bit | ||
| 20 | #config.vm.box = "bento/opensuse-13.2-x86_64" | ||
| 21 | # | ||
| 22 | # Virtualbox only | ||
| 23 | #config.vm.box = "bento/opensuse-13.2-i386" | ||
| 24 | # config.vm.box = "" | ||
| 25 | # config.vm.box = "" | ||
| 26 | 7 | ||
| 27 | # This section allows you to customize the Virtualbox VM | 8 | # This section allows you to customize the Virtualbox VM |
| 28 | # settings, ie showing the GUI or upping the memory | 9 | # settings, ie showing the GUI or upping the memory |
| @@ -81,18 +62,16 @@ Vagrant.configure(2) do |config| | |||
| 81 | config.vm.provision "shell", run: "always", path: "./util/install_dependencies.sh", args: "-update" | 62 | config.vm.provision "shell", run: "always", path: "./util/install_dependencies.sh", args: "-update" |
| 82 | 63 | ||
| 83 | config.vm.post_up_message = <<-EOT | 64 | config.vm.post_up_message = <<-EOT |
| 84 | Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win) | ||
| 85 | or 'vagrant ssh-config' and Putty or Bitvise SSH or another SSH tool | ||
| 86 | |||
| 87 | Change directory (cd) to the keyboard you wish to program | ||
| 88 | (Optionally) modify your layout, | ||
| 89 | then run 'make clean' | ||
| 90 | and then 'make' to compile the .eep and .hex files. | ||
| 91 | |||
| 92 | Or you can copy and paste the example line below. | ||
| 93 | 65 | ||
| 94 | cd /vagrant; cd keyboards; cd ergodox; make clean; make | 66 | Log into the VM using 'vagrant ssh'. QMK directory synchronized with host is |
| 67 | located at /vagrant | ||
| 68 | To compile the .hex files use make command inside this directory. | ||
| 95 | 69 | ||
| 70 | QMK's make format recently changed to use folder locations and colons: | ||
| 71 | make project_folder:keymap[:target] | ||
| 72 | Examples: | ||
| 73 | make planck/rev4:default:dfu | ||
| 74 | make planck:default | ||
| 96 | 75 | ||
| 97 | EOT | 76 | EOT |
| 98 | end | 77 | end |
