From c22d0ac97ff80591026502af40c2f360802664d2 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Wed, 16 Mar 2016 13:49:46 -0700
Subject: [PATCH] simplify mason_latest.sh publishing

---
 .travis.yml              |  4 ++++
 mason_latest.sh          | 24 +++++++++++++++++-------
 scripts/travis-common.sh |  8 --------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 61e7a1c2d..4f3117e3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,6 +82,10 @@ script:
 
 after_success:
  - 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 link &&
      ./mason_latest.sh publish;
diff --git a/mason_latest.sh b/mason_latest.sh
index 62a0c94f0..6e21f1c0f 100755
--- a/mason_latest.sh
+++ b/mason_latest.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -eu
+
 MASON_NAME=mapnik
 MASON_VERSION=latest
 MASON_LIB_FILE=lib/libmapnik-wkt.a
@@ -13,21 +15,29 @@ function mason_load_source {
 function mason_compile {
     HERE=$(pwd)
     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";
         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;
+            echo $(basename $f);
+            install_name_tool -id plugins/input/$(basename $f) $f;
             install_name_tool -change ${MASON_PREFIX}"/lib/libmapnik.dylib" @loader_path/../../libmapnik.dylib $f;
         done;
     fi;
     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 {} \;
 }
 
diff --git a/scripts/travis-common.sh b/scripts/travis-common.sh
index 8aa24655d..cf28e08e0 100644
--- a/scripts/travis-common.sh
+++ b/scripts/travis-common.sh
@@ -83,14 +83,6 @@ configure () {
     if enabled ${COVERAGE}; then
         ./configure "$@" PGSQL2SQLITE=False SVG2PNG=False SVG_RENDERER=False \
             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
         ./configure "$@" WARNING_CXXFLAGS="-Wno-unknown-warning-option"
     fi