Merge branch 'HelioGuilherme66-fedora28' into wxPy-4.0.x

(cherry picked from commit 476a597936)
This commit is contained in:
Robin Dunn
2018-06-23 18:31:30 -07:00
parent ce6f585444
commit 3407c57980
4 changed files with 14 additions and 9 deletions

View File

@@ -5,7 +5,7 @@ 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.box = "fedora/28-cloud-base"
config.vm.provision :shell, path: "bootstrap.sh"
# Additional parameters for the VM
@@ -21,4 +21,8 @@ Vagrant.configure("2") do |config|
# And share a folder with the build script
config.vm.synced_folder "../scripts", "/home/vagrant/scripts"
# set auto_update to false, if you do NOT want to check the correct
# additions version when booting this machine
config.vbguest.auto_update = false
end

View File

@@ -10,22 +10,22 @@ 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 \
webkitgtk4 webkitgtk4-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 \
libXtst-devel
# 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 python python-tools python-devel python2-virtualenv
dnf -y install python3 python3-tools python3-devel
dnf -y install python35
#dnf -y install python35
# 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
python3.4 -m venv venvs/Py34
python3.5 -m venv venvs/Py35
#python3.5 -m venv venvs/Py35
python3.6 -m venv venvs/Py36
chown -R vagrant:vagrant venvs