Merge branch 'kollivier-master'

This commit is contained in:
Robin Dunn
2017-09-08 19:31:09 -07:00
3 changed files with 55 additions and 0 deletions

View File

@@ -1460,6 +1460,7 @@ def cmd_build_vagrant(options, args):
if not options.vagrant_vms or options.vagrant_vms == 'all':
VMs = [ 'centos-7',
'debian-8',
'fedora-23',
'fedora-24',
'ubuntu-14.04',
'ubuntu-16.04',

24
vagrant/fedora-23/Vagrantfile vendored Normal file
View File

@@ -0,0 +1,24 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
Vagrant.configure("2") do |config|
# Set which Vagrant "box" (base image) to use, and tell it how to set up the
# VM, packages to install, etc.
config.vm.box = "fedora/23-cloud-base"
config.vm.provision :shell, path: "bootstrap.sh"
# Additional parameters for the VM
config.vm.provider "virtualbox" do |vb|
vb.memory = 4096
vb.cpus = 4
end
# Share the Phoenix/dist folder so the VM can get the source tarball and has
# a place to put the build results.
config.vm.synced_folder "../../dist", "/home/vagrant/dist"
# And share a folder with the build script
config.vm.synced_folder "../scripts", "/home/vagrant/scripts"
end

View File

@@ -0,0 +1,30 @@
#!/bin/bash
# Set up and update package repos
dnf -y update
dnf -y install yum-utils
# Install necessary development tools, libs, etc.
dnf -y group install "Development Tools"
dnf -y install gcc-c++
dnf -y install gtk2 gtk2-devel gtk3 gtk3-devel \
webkitgtk webkitgtk-devel webkitgtk3 webkitgtk3-devel \
libjpeg-turbo-devel libpng-devel libtiff-devel \
SDL SDL-devel gstreamer gstreamer-devel gstreamer-plugins-base-devel \
freeglut freeglut-devel libnotify libnotify-devel libSM-devel
dnf -y install python35
# Install all available Python packages and their dev packages
dnf -y install python python-tools python-devel python-virtualenv
dnf -y install python34 python34-tools python34-devel
dnf -y install python3 python3-tools python3-devel
# Set up virtual environments for each Python where the Phoenix builds will be
# done. set them to the vagrant user so the venv's can be updated by pip later.
mkdir venvs
virtualenv --python=python2.7 venvs/Py27
pyvenv-3.4 venvs/Py34
pyvenv-3.5 venvs/Py35
chown -R vagrant:vagrant venvs