Merge pull request #4 from jaqque/master

Vagrant Provisioning
This commit is contained in:
Jordan Cristiano 2015-10-15 22:34:04 -04:00
commit 004d87a972
4 changed files with 32 additions and 14 deletions

1
.gitignore vendored
View File

@ -34,6 +34,7 @@ Desktop.ini
# Generated Project Files # Generated Project Files
premake/*/ premake/*/
bin/*
# Vagrant # Vagrant
.vagrant/ .vagrant/

View File

@ -78,16 +78,15 @@ When following instructions below, the compiled binary will be output in the bin
### Using Vagrant ### Using Vagrant
# Launch VM # Launch VM and build
vagrant up vagrant up
# Patch VM and re-build
vagrant provision
# Manual build
vagrant ssh vagrant ssh
cd /vagrant cd /vagrant/premake
# Install Linux dependencies (first time setup)
./vagrant.sh
# Build demboyz
cd premake
./gmake.sh && cd gmake ./gmake.sh && cd gmake
make make

3
Vagrantfile vendored
View File

@ -119,4 +119,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# chef-validator, unless you changed the configuration. # chef-validator, unless you changed the configuration.
# #
# chef.validation_client_name = "ORGNAME-validator" # chef.validation_client_name = "ORGNAME-validator"
# Shell provisioner
config.vm.provision "shell", path: "vagrant.sh"
end end

View File

@ -1,13 +1,28 @@
#!/bin/bash #!/bin/sh
# http://askubuntu.com/a/497033 # http://askubuntu.com/a/497033
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt-get update sudo apt-get update
sudo apt-get install build-essential -y # Remove X11 cruft
sudo apt-get autoremove -y
sudo apt-get install gcc-4.9 g++-4.9 -y # Keep things up to date
sudo apt-get install gcc-4.9-multilib g++-4.9-multilib -y sudo apt-get upgrade -y
sudo apt-get install clang-3.6++ -y packages=""; # Start with nothing; can re-order rest to heart's content
sudo ln -s /usr/bin/clang++-3.6 /usr/bin/clang++
packages="$packages build-essential"
packages="$packages gcc-4.9 g++-4.9"
packages="$packages gcc-4.9-multilib g++-4.9-multilib"
packages="$packages clang-3.6++"
sudo apt-get install -y $packages
# Why doesn't clang do this for us?
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.6 10
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.6 10
# Build it!
cd /vagrant/premake
./gmake.sh && { cd gmake; make; }