remove auto-publishing to mason

This commit is contained in:
Dane Springmeyer 2017-03-15 14:15:22 -07:00
parent 0c24558db8
commit ee65bd33e3
2 changed files with 2 additions and 76 deletions

View file

@ -10,8 +10,6 @@ env:
- CCACHE_COMPRESS=1 - CCACHE_COMPRESS=1
- HEAVY_JOBS="2" - HEAVY_JOBS="2"
- PREFIX=/tmp/mapnik - PREFIX=/tmp/mapnik
- secure: "D5CLP5lbyFru788iZO8RqDenY/YsHPREvr34zCEi93xMqOTxPmME/zyuEZSyjP5ZLyf8g/fxOuPYSDbOQ1QLwNDBWxB0JomWOahyimHKrMCrMcGHCjl//2W2mE+p9VwF5VLGgfy7CskGkS49Mye37FDK0ejwuq6MDI45DsH4Fkk="
- secure: "ZPHyAVL3ID5g3KEmwcnzG9z2tAQwSx526Qd3Y6tsZ3Yj+aSagVBiZQjZGKWgNX74lymtmYKnb2Md46apWLeImt6tjB3MWTu7WwWoZRnqUligz/8Nmg4Lgo7EOCkQcjN/gpA1i+cM5b+ZKDTZYOaHO6/+DAaunQzA7/p99hw/XYg="
- secure: "F6ivqDNMBQQnrDGA9+7IX+GDswuIqQQd7YPJdQqa2Ked9jddAQDeJClb05ig3JlwfOlYLGZOd43ZX0pKuMtI2Gbkwz211agGP9S3YunwlRg8iWtJlO5kYFUdKCmJNhjg4icfkGELCgwXn+zuEWFSLpkPcjqAFKFlQrIJeAJJgKM=" - secure: "F6ivqDNMBQQnrDGA9+7IX+GDswuIqQQd7YPJdQqa2Ked9jddAQDeJClb05ig3JlwfOlYLGZOd43ZX0pKuMtI2Gbkwz211agGP9S3YunwlRg8iWtJlO5kYFUdKCmJNhjg4icfkGELCgwXn+zuEWFSLpkPcjqAFKFlQrIJeAJJgKM="
addons: addons:
postgresql: "9.4" postgresql: "9.4"
@ -33,7 +31,7 @@ matrix:
- os: linux - os: linux
sudo: false sudo: false
compiler: ": clang" compiler: ": clang"
env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" TRIGGER=true env: JOBS=8 CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" TRIGGER=true
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test']
@ -50,7 +48,7 @@ matrix:
compiler: ": clang-osx" compiler: ": clang-osx"
# https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions # https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
osx_image: xcode7.3 # upgrades clang from 6 -> 7 osx_image: xcode7.3 # upgrades clang from 6 -> 7
env: JOBS=4 MASON_PUBLISH=true CXX="ccache clang++ -Qunused-arguments" env: JOBS=4 CXX="ccache clang++ -Qunused-arguments"
before_install: before_install:
# workaround travis rvm bug # workaround travis rvm bug
@ -115,8 +113,3 @@ script:
after_success: after_success:
- enabled ${TRIGGER} trigger_downstream - enabled ${TRIGGER} trigger_downstream
- if enabled ${MASON_PUBLISH}; then
source ./.mason/mason.sh &&
./mason_latest.sh build &&
./mason_latest.sh publish;
fi

View file

@ -1,67 +0,0 @@
#!/usr/bin/env bash
MASON_NAME=mapnik
MASON_VERSION=latest
MASON_LIB_FILE=lib/libmapnik-wkt.a
# warning: may break when https://github.com/mapbox/mason/issues/141 lands
# hence we are pinned for now to older mason in bootstrap.sh
. ./.mason/mason.sh
set -eu
function mason_load_source {
export MASON_BUILD_PATH=$(pwd)
}
function mason_compile {
HERE=$(pwd)
make install
# this is to adapt to when mapnik is not installed in MASON_PREFIX
# originally (to make it easier to publish locally as a stopgap)
MAPNIK_PREFIX=$(mapnik-config --prefix)
if [[ ${MAPNIK_PREFIX} != ${MASON_PREFIX} ]]; then
mkdir -p ${MASON_PREFIX}/lib
mkdir -p ${MASON_PREFIX}/include
mkdir -p ${MASON_PREFIX}/bin
cp -r ${MAPNIK_PREFIX}/lib/*mapnik* ${MASON_PREFIX}/lib/
cp -r ${MAPNIK_PREFIX}/include/mapnik ${MASON_PREFIX}/include/
cp -r ${MAPNIK_PREFIX}/bin/mapnik* ${MASON_PREFIX}/bin/
cp -r ${MAPNIK_PREFIX}/bin/shapeindex ${MASON_PREFIX}/bin/
fi
if [[ $(uname -s) == 'Darwin' ]]; then
install_name_tool -id @loader_path/lib/libmapnik.dylib ${MASON_PREFIX}"/lib/libmapnik.dylib";
PLUGINDIR=${MASON_PREFIX}"/lib/mapnik/input/*.input";
for f in $PLUGINDIR; do
echo $f;
echo $(basename $f);
install_name_tool -id plugins/input/$(basename $f) $f;
install_name_tool -change "${MAPNIK_PREFIX}/lib/libmapnik.dylib" @loader_path/../../lib/libmapnik.dylib $f;
done;
BINDIR=${MASON_PREFIX}"/bin/*";
for f in $BINDIR; do
echo $f;
echo $(basename $f);
if [[ $(file $f) =~ 'Mach-O' ]]; then
install_name_tool -id bin/$(basename $f) $f;
install_name_tool -change "${MAPNIK_PREFIX}/lib/libmapnik.dylib" @loader_path/../lib/libmapnik.dylib $f;
fi
done;
fi;
python -c "data=open('$MASON_PREFIX/bin/mapnik-config','r').read();open('$MASON_PREFIX/bin/mapnik-config','w').write(data.replace('$HERE','.'))"
find ${MASON_PREFIX} -name "*.pyc" -exec rm {} \;
}
function mason_cflags {
:
}
function mason_ldflags {
:
}
function mason_clean {
echo "Done"
}
mason_run "$@"