Fix Vagrant

Author: rouault

Vagrantfile

@@ -6,6 +6,12 @@ require 'socket'
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
+$set_environment_variables = <<SCRIPT
+tee "/etc/profile.d/myvars.sh" > "/dev/null" <<EOF
+export LD_LIBRARY_PATH=/vagrant/install-vagrant-proj-6/lib
+EOF
+SCRIPT
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   vm_ram = ENV['VAGRANT_VM_RAM'] || 2048
   vm_cpu = ENV['VAGRANT_VM_CPU'] || 2
@@ -37,4 +43,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision "shell", path: "scripts/vagrant/proj6.sh"
   config.vm.provision "shell", path: "scripts/vagrant/mapserver.sh"
 
+  config.vm.provision "shell", inline: $set_environment_variables, run: "always"
+
 end
+
+

scripts/vagrant/packages.sh

@@ -8,11 +8,12 @@ apt-get update
 apt-get install -y python-software-properties
 add-apt-repository -y ppa:ubuntugis/ppa
 add-apt-repository -y ppa:ubuntugis/ubuntugis-testing
+add-apt-repository -y ppa:dluxen/cmake-backports
 apt-get update
 apt-get -y upgrade
 
 # install packages we need
-apt-get install -q -y git build-essential pkg-config cmake libgeos-dev rake \
+apt-get install -q -y git build-essential pkg-config cmake3 libgeos-dev rake \
     libpq-dev python-all-dev libproj-dev libxml2-dev postgis php5-dev \
     postgresql-server-dev-9.3 postgresql-9.3-postgis-2.2 vim bison flex swig \
     librsvg2-dev libpng12-dev libjpeg-dev libgif-dev \
@@ -21,4 +22,6 @@ apt-get install -q -y git build-essential pkg-config cmake libgeos-dev rake \
     libprotobuf-dev libprotobuf-c0-dev protobuf-c-compiler libharfbuzz-dev gdal-bin \
     curl sqlite3
 
+curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+python get-pip.py
 pip install -U -r /vagrant/msautotest/requirements.txt

scripts/vagrant/proj6.sh

@@ -9,6 +9,7 @@ cd /vagrant
 curl -s http://download.osgeo.org/proj/proj-6.1.1.tar.gz > proj-6.1.1.tar.gz
 tar xzf proj-6.1.1.tar.gz
 rm -rf vagrant-proj
+rm -rf /vagrant/install-vagrant-proj-6
 mv proj-6.1.1 vagrant-proj
 (cd vagrant-proj/data && curl -s http://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz > proj-datumgrid-1.8.tar.gz && tar xvzf proj-datumgrid-1.8.tar.gz)
 (cd vagrant-proj; CFLAGS='-DPROJ_RENAME_SYMBOLS -O2' CXXFLAGS='-DPROJ_RENAME_SYMBOLS -O2' ./configure --disable-static --prefix=/vagrant/install-vagrant-proj-6 && make -j $NUMTHREADS && make -j $NUMTHREADS install)