From 0e5f6263575b9b131c2a9a4a4f45cc201575ef50 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Wed, 10 Feb 2016 18:11:48 +0100
Subject: [PATCH] Travis: fixed deployment

* Copy external dependencies of boost-regex inside the Travis specific
configuration file.
* TUTTLEOFX_INSTALL environment variable should exist.
* Update condition to trigger deployement.
---
 .travis.yml            | 6 +++++-
 tools/travis/deploy.sh | 9 +--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64ae2e244..1645304d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -124,6 +124,9 @@ addons:
     branch_pattern: coverity_scan
 
 before_deploy:
+  # copy external dependencies of boost-regex
+  - if [ ${TRAVIS_OS_NAME} = "linux" ]; then cp /usr/lib/{libicuuc.so.48,libicui18n.so.48,libicudata.so.48} ${TUTTLEOFX_INSTALL}/lib; fi
+  # prepare deployment
   - tools/travis/deploy.sh
 
 deploy:
@@ -133,5 +136,6 @@ deploy:
   file: ${TUTTLEOFX_DEPLOY}-${CC}-python-${PYTHON_VERSION}.tgz
   skip_cleanup: true
   on:
-    branch: master
+    tags: true
+    all_branches: true
     condition: ${CC} = "gcc"
diff --git a/tools/travis/deploy.sh b/tools/travis/deploy.sh
index b13e65a05..04ff47673 100755
--- a/tools/travis/deploy.sh
+++ b/tools/travis/deploy.sh
@@ -5,13 +5,6 @@ set -e
 # Print commands and their arguments as they are executed.
 set -x
 
-if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
-    # Fix additionnal dependencies of boost-regex
-    cp /usr/lib/libicuuc.so.48 ${TUTTLE_INSTALL}/lib
-    cp /usr/lib/libicui18n.so.48 ${TUTTLE_INSTALL}/lib
-    cp /usr/lib/libicudata.so.48 ${TUTTLE_INSTALL}/lib
-fi
-
 # Create archive
 cd ${TRAVIS_BUILD_DIR}
-tar -czf ${TUTTLE_DEPLOY}-${CC}-python-${PYTHON_VERSION}.tgz install-tuttle
+tar -czf ${TUTTLEOFX_DEPLOY}-${CC}-python-${PYTHON_VERSION}.tgz install-tuttle