1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00

LP-442 Update Vagrant files for latest build in order to have a reproducible dev environment. Android build on virtual machine is not verified.

This commit is contained in:
karstentellingnielsen 2016-10-29 15:17:22 +02:00 committed by Philippe Renon
parent b05f7d96a5
commit 5f89daf426
3 changed files with 62 additions and 47 deletions

View File

@ -1,35 +1,33 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "ubuntu/trusty64"
#config.vm.box = "jhartman/xubuntu14.04.1"
config.vm.provider "virtualbox" do |vb|
vb.gui = true
vb.customize ["modifyvm", :id, "--memory", "4096"]
end
#config.vm.synced_folder "../../projects", "/home/vagrant/projects"
config.vm.provision :shell, :path => "bootstrap.sh"
config.ssh.forward_x11=true
# update definitions
config.vm.provision "shell", inline: "apt-get update"
# just the basic desktop environment. if you want the addons, you can install them later
config.vm.provision "shell", inline: "apt-get install xubuntu-desktop --no-install-recommends --assume-yes"
# otherwise icons don't get loaded
config.vm.provision "shell", inline: "apt-get install xubuntu-icon-theme --assume-yes"
#activate logon with gui and reboot
config.vm.provision "shell", inline: "dpkg-reconfigure lightdm"
config.vm.provision "shell", inline: "reboot"
end
# -*- mode: ruby -*-
# vi: set ft=ruby :
VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "ubuntu/trusty64"
config.vm.provider "virtualbox" do |vb|
# GUI can be enabled after provisioning. For now SSH and GUI is not compatible
# vb.gui = true
vb.customize ["modifyvm", :id, "--memory", "4096"]
end
config.vm.provision :shell, :path => "bootstrap.sh"
config.ssh.forward_x11=true
# update definitions
config.vm.provision "shell", inline: "apt-get update"
# just the basic desktop environment. if you want the addons, you can install them later
config.vm.provision "shell", inline: "apt-get install xubuntu-desktop --no-install-recommends --assume-yes"
# otherwise icons don't get loaded
config.vm.provision "shell", inline: "apt-get install xubuntu-icon-theme --assume-yes"
#activate logon with gui and reboot
config.vm.provision "shell", inline: "dpkg-reconfigure lightdm"
config.vm.provision "shell", inline: "reboot"
end

View File

@ -1,10 +1,10 @@
#!/usr/bin/env bash
apt-get update
apt-get -y upgrade
sudo apt-get update
sudo apt-get --yes --force-yes upgrade
# get ourselves some basic toys
apt-get -y install git-core build-essential openssl libssl-dev
sudo apt-get --yes --force-yes install git-core build-essential openssl libssl-dev
# install some tools for the vagrant user only by executing
# a script AS the vagrant user

View File

@ -1,5 +1,9 @@
#!/usr/bin/env bash
echo "
Setup a build environment
"
ANDROID_ENV=true
ANDROID_STUDIO_VERSION=1.1.0
ANDROID_STUDIO_BUILD=135.1740770
@ -11,10 +15,14 @@ ANDROID_SDK_URL=http://dl.google.com/android/${ANDROID_SDK_FILE}
ANDROID_API_LEVELS=android-20,android-21,android-22
ANDROID_BUILD_TOOLS_VERSION=21.1.2
sudo apt-get -y install curl build-essential gdb wget \
debhelper p7zip-full unzip flex bison libsdl1.2-dev libudev-dev libusb-1.0-0-dev libc6-i386
# Setup a build environment
sudo add-apt-repository --yes ppa:librepilot/tools
sudo apt-get --yes --force-yes update
sudo apt-get --yes --force-yes install build-essential ccache debhelper git-core git-doc flex graphviz bison libudev-dev libusb-1.0-0-dev libsdl1.2-dev python libopenscenegraph-dev qt56-meta-minimal qt56svg qt56script qt56serialport qt56multimedia qt56translations qt56tools qt56quickcontrols libosgearth-dev openscenegraph-plugin-osgearth
sudo apt-get --yes --force-yes install libc6-i386
# Do Android stuff
if [ "$ANDROID_ENV" = "true" ]; then
# install java7
@ -25,7 +33,7 @@ if [ "$ANDROID_ENV" = "true" ]; then
# accept the license agreement
echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
sudo apt-get -y install oracle-java7-installer
sudo apt-get --yes --force-yes install oracle-java7-installer
# make a place to install development tools
mkdir -p ~/workspace/tools
@ -63,12 +71,21 @@ if [ "$ANDROID_ENV" = "true" ]; then
fi
# Checkout code
mkdir -p ~/workspace/
cd ~/workspace/
git clone https://bitbucket.org/librepilot/librepilot.git
cd librepilot
git checkout next
mkdir -p ~/workspace/openpilot
cd ~/workspace/openpilot
git clone git://git.openpilot.org/OpenPilot.git
cd OpenPilot
git checkout -b next origin/next
git pull
# The build_sdk_install do not install the ARM build correctly. Add this line for now
# sudo apt --yes --force-yes install gcc-arm-none-eabi
sudo apt-get --yes --force-yes remove gcc-arm-none-eabi
# Dev Tools Installation
make build_sdk_install
# Done
echo Ready to go