bootstrap cleanups

This commit is contained in:
Dane Springmeyer 2015-02-02 22:08:52 -08:00
parent cf38337121
commit 047a27925f

View file

@ -10,8 +10,6 @@ todo
- clang debs to s3 - clang debs to s3
- docs for base setup: sudo apt-get -y install zlib1g-dev python-dev make git python-dev - docs for base setup: sudo apt-get -y install zlib1g-dev python-dev make git python-dev
- shrink icu data - shrink icu data
- cairo/pycairo
- pkg-config-less
' '
function setup_mason() { function setup_mason() {
@ -28,37 +26,37 @@ function setup_mason() {
export CC=${CC:-clang} export CC=${CC:-clang}
} }
function ip() { function install() {
if [[ ! -d ./mason_packages/${3}/${1}/ ]]; then MASON_PLATFORM_ID=$(mason env MASON_PLATFORM_ID)
if [[ ! -d ./mason_packages/${MASON_PLATFORM_ID}/${1}/ ]]; then
mason install $1 $2 mason install $1 $2
mason link $1 $2 mason link $1 $2
fi fi
} }
function install_mason_deps() { function install_mason_deps() {
MASON_PLATFORM_ID=$(mason env MASON_PLATFORM_ID) install freetype 2.5.4
ip freetype 2.5.4 $MASON_PLATFORM_ID install harfbuzz 2cd5323
ip harfbuzz 2cd5323 $MASON_PLATFORM_ID install jpeg_turbo 1.4.0
ip jpeg_turbo 1.4.0 $MASON_PLATFORM_ID install libxml2 2.9.2
ip libxml2 2.9.2 $MASON_PLATFORM_ID install libpng 1.6.16
ip libpng 1.6.16 $MASON_PLATFORM_ID install webp 0.4.2
ip webp 0.4.2 $MASON_PLATFORM_ID install icu 54.1
ip icu 54.1 $MASON_PLATFORM_ID install proj 4.8.0
ip proj 4.8.0 $MASON_PLATFORM_ID install libtiff 4.0.4beta
ip libtiff 4.0.4beta $MASON_PLATFORM_ID install boost 1.57.0
ip boost 1.57.0 $MASON_PLATFORM_ID install boost_libsystem 1.57.0
ip boost_libsystem 1.57.0 $MASON_PLATFORM_ID install boost_libthread 1.57.0
ip boost_libthread 1.57.0 $MASON_PLATFORM_ID install boost_libfilesystem 1.57.0
ip boost_libfilesystem 1.57.0 $MASON_PLATFORM_ID install boost_libprogram_options 1.57.0
ip boost_libprogram_options 1.57.0 $MASON_PLATFORM_ID install boost_libregex 1.57.0
ip boost_libregex 1.57.0 $MASON_PLATFORM_ID install boost_libpython 1.57.0
ip boost_libpython 1.57.0 $MASON_PLATFORM_ID install libpq 9.4.0
ip libpq 9.4.0 $MASON_PLATFORM_ID install sqlite 3.8.8.1
ip sqlite 3.8.8.1 $MASON_PLATFORM_ID install gdal 1.11.1
ip gdal 1.11.1 $MASON_PLATFORM_ID install expat 2.1.0
ip expat 2.1.0 $MASON_PLATFORM_ID install pixman 0.32.6
ip pixman 0.32.6 $MASON_PLATFORM_ID install cairo 1.12.18
ip cairo 1.12.18 $MASON_PLATFORM_ID
} }
function setup_nose() { function setup_nose() {
@ -71,7 +69,6 @@ function setup_nose() {
function make_config() { function make_config() {
local MASON_LINKED_REL=./mason_packages/.link local MASON_LINKED_REL=./mason_packages/.link
export PKG_CONFIG_PATH="${MASON_LINKED_REL}/lib/pkgconfig"
export C_INCLUDE_PATH="${MASON_LINKED_REL}/include" export C_INCLUDE_PATH="${MASON_LINKED_REL}/include"
export CPLUS_INCLUDE_PATH="${MASON_LINKED_REL}/include" export CPLUS_INCLUDE_PATH="${MASON_LINKED_REL}/include"
export LIBRARY_PATH="${MASON_LINKED_REL}/lib" export LIBRARY_PATH="${MASON_LINKED_REL}/lib"
@ -85,6 +82,7 @@ CUSTOM_LDFLAGS = '-L${MASON_LINKED_REL}/lib'
RUNTIME_LINK = 'static' RUNTIME_LINK = 'static'
INPUT_PLUGINS = 'all' INPUT_PLUGINS = 'all'
PATH = '${MASON_LINKED_REL}/bin' PATH = '${MASON_LINKED_REL}/bin'
PKG_CONFIG_PATH = '${MASON_LINKED_REL}/lib/pkgconfig'
PATH_REMOVE = '/usr:/usr/local' PATH_REMOVE = '/usr:/usr/local'
PATH_REPLACE = '/Users/travis/build/mapbox/mason/mason_packages:./mason_packages' PATH_REPLACE = '/Users/travis/build/mapbox/mason/mason_packages:./mason_packages'
BOOST_INCLUDES = '${MASON_LINKED_REL}/include' BOOST_INCLUDES = '${MASON_LINKED_REL}/include'