sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify mason_latest.sh publishing

Browse source
This commit is contained in:
Dane Springmeyer 2016-03-16 13:49:46 -07:00
parent 087add2c71
commit c22d0ac97f
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -82,6 +82,10 @@ script:
after_success: after_success:
- if enabled ${MASON_PUBLISH}; then - if enabled ${MASON_PUBLISH}; then
export MASON_NAME=mapnik
export MASON_VERSION=latest
export MASON_LIB_FILE=lib/libmapnik-wkt.a
source ./.mason/mason.sh &&
./mason_latest.sh build && ./mason_latest.sh build &&
./mason_latest.sh link && ./mason_latest.sh link &&
./mason_latest.sh publish; ./mason_latest.sh publish;

24
mason_latest.sh
View file

@ -1,5 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eu
MASON_NAME=mapnik MASON_NAME=mapnik
MASON_VERSION=latest MASON_VERSION=latest
MASON_LIB_FILE=lib/libmapnik-wkt.a MASON_LIB_FILE=lib/libmapnik-wkt.a
@ -13,21 +15,29 @@ function mason_load_source {
function mason_compile { function mason_compile {
HERE=$(pwd) HERE=$(pwd)
make install make install
if [[ `uname` == 'Darwin' ]]; then # this is to adapt to when mapnik is not installed in MASON_PREFIX
# originally (to make it easier to publish locally as a stopgap)
if [[ $(mapnik-config --prefix) != ${MASON_PREFIX} ]]; then
MAPNIK_PREFIX=$(mapnik-config --prefix)
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/libmapnik.dylib ${MASON_PREFIX}"/lib/libmapnik.dylib"; install_name_tool -id @loader_path/libmapnik.dylib ${MASON_PREFIX}"/lib/libmapnik.dylib";
PLUGINDIR=${MASON_PREFIX}"/lib/mapnik/input/*.input"; PLUGINDIR=${MASON_PREFIX}"/lib/mapnik/input/*.input";
for f in $PLUGINDIR; do for f in $PLUGINDIR; do
echo $f; echo $f;
echo `basename $f`; echo $(basename $f);
install_name_tool -id plugins/input/`basename $f` $f; install_name_tool -id plugins/input/$(basename $f) $f;
install_name_tool -change ${MASON_PREFIX}"/lib/libmapnik.dylib" @loader_path/../../libmapnik.dylib $f; install_name_tool -change ${MASON_PREFIX}"/lib/libmapnik.dylib" @loader_path/../../libmapnik.dylib $f;
done; done;
fi; fi;
python -c "data=open('$MASON_PREFIX/bin/mapnik-config','r').read();open('$MASON_PREFIX/bin/mapnik-config','w').write(data.replace('$HERE','.'))" python -c "data=open('$MASON_PREFIX/bin/mapnik-config','r').read();open('$MASON_PREFIX/bin/mapnik-config','w').write(data.replace('$HERE','.'))"
mkdir -p ${MASON_PREFIX}/share/icu
cp -r $GDAL_DATA ${MASON_PREFIX}/share/
cp -r $PROJ_LIB ${MASON_PREFIX}/share/
cp -r $ICU_DATA/*dat ${MASON_PREFIX}/share/icu/
find ${MASON_PREFIX} -name "*.pyc" -exec rm {} \; find ${MASON_PREFIX} -name "*.pyc" -exec rm {} \;
} }

8
scripts/travis-common.sh
View file

@ -83,14 +83,6 @@ configure () {
if enabled ${COVERAGE}; then if enabled ${COVERAGE}; then
./configure "$@" PGSQL2SQLITE=False SVG2PNG=False SVG_RENDERER=False \ ./configure "$@" PGSQL2SQLITE=False SVG2PNG=False SVG_RENDERER=False \
COVERAGE=True DEBUG=True WARNING_CXXFLAGS="-Wno-unknown-warning-option" COVERAGE=True DEBUG=True WARNING_CXXFLAGS="-Wno-unknown-warning-option"
elif enabled ${MASON_PUBLISH}; then
export MASON_NAME=mapnik
export MASON_VERSION=latest
export MASON_LIB_FILE=lib/libmapnik-wkt.a
source ./.mason/mason.sh
./configure "$@" PREFIX=${MASON_PREFIX} \
PATH_REPLACE='' MAPNIK_BUNDLED_SHARE_DIRECTORY=True \
RUNTIME_LINK='static' WARNING_CXXFLAGS="-Wno-unknown-warning-option"
else else
./configure "$@" WARNING_CXXFLAGS="-Wno-unknown-warning-option" ./configure "$@" WARNING_CXXFLAGS="-Wno-unknown-warning-option"
fi fi