From 213830a1ec17535a651fdf4c6f12eb967182059e Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 3 Feb 2017 14:15:43 -0800 Subject: [PATCH] Add Py36 and gstreamer 1.0 to the Ubuntu 16.04 vagrant box --- vagrant/scripts/build.sh | 2 +- vagrant/ubuntu-16.04/bootstrap.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/vagrant/scripts/build.sh b/vagrant/scripts/build.sh index e8d80b40..5575fe5b 100755 --- a/vagrant/scripts/build.sh +++ b/vagrant/scripts/build.sh @@ -45,7 +45,7 @@ function do_build { rm -rf ~/wxPython_Phoenix-* # setup - echo "**** do_build $TAG $FLAG ****" + echo "**** do_build $VENV $TAG $FLAG ****" echo "Using Python from VENV $VENV" ORIG_PATH=$PATH export PATH=$VENV/bin:$PATH diff --git a/vagrant/ubuntu-16.04/bootstrap.sh b/vagrant/ubuntu-16.04/bootstrap.sh index 592c40f0..da1efd25 100644 --- a/vagrant/ubuntu-16.04/bootstrap.sh +++ b/vagrant/ubuntu-16.04/bootstrap.sh @@ -1,30 +1,33 @@ #!/bin/bash # Set up and update package repos -#add-apt-repository ppa:fkrull/deadsnakes +add-apt-repository ppa:fkrull/deadsnakes apt-get update # Install necessary development tools, libs, etc. apt-get install -y build-essential dpkg-dev +apt-get install -y aptitude mc apt-get install -y libgtk2.0-dev libgtk-3-dev apt-get install -y libjpeg-dev libtiff-dev \ libsdl1.2-dev libgstreamer-plugins-base0.10-dev \ + libgstreamer-plugins-base1.0-dev \ libnotify-dev freeglut3 freeglut3-dev libsm-dev \ libwebkitgtk-dev libwebkitgtk-3.0-dev # Install all available Python packages and their dev packages apt-get install -y python2.7 python2.7-dev libpython2.7-dev python-virtualenv -#apt-get install -y python3.4 python3.4-dev libpython3.4-dev python3.4-venv apt-get install -y python3.5 python3.5-dev libpython3.5-dev python3.5-venv +apt-get install -y python3.6 python3.6-dev libpython3.6-dev python3.6-venv # 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 +python3.6 -m venv venvs/Py36 + #chown -R vagrant:vagrant venvs # This box provides a user named "ubuntu" instead chown -R ubuntu:ubuntu venvs