Merge pull request #3 from manics/python3

Use relative path, include tag in name and folder

.travis.yml

@@ -1,28 +1,19 @@
-dist: xenial
-language: python
-cache: pip
-sudo: required
+---
+language: minimal
 services:
 - docker
 
 before_script:
 - docker build -t builder .
 
 script:
-- docker run --rm -v $PWD/dist:/dist builder
+- docker run --rm -v $PWD/dist:/dist -e TRAVIS_BRANCH=$TRAVIS_BRANCH builder
 
 deploy:
   - provider: releases
     api_key: $GITHUB_OAUTH_TOKEN
     file_glob: true
-    file: dist/zeroc*
+    file: dist/*
     skip_cleanup: true
     on:
       tags: true
-  - provider: releases
-    api_key: $GITHUB_OAUTH_TOKEN
-    file_glob: true
-    file: dist/Ice*
-    skip_cleanup: true
-    on:
-      tags: true

README.md

@@ -14,3 +14,15 @@ To build a different version of Ice:
     docker run --rm -v $PWD/dist:/dist builder VERSION
 
 Packages will be copied to `$PWD/dist`.
+
+
+Installing the binaries
+-----------------------
+
+```
+cd /opt
+tar -zxf ice-3.6.5-${RELEASE}-ubuntu1804-amd64.tar.gz
+```
+These binaries are compiled with a prefix of `/opt/ice-3.6.5-${RELEASE}`.
+It may be possible to relocate them but this is untested.
+

build.sh

@@ -3,17 +3,21 @@
 set -eux
 
 ICE_VERSION=${1:-"3.6.5"}
+BUILD=${TRAVIS_BRANCH:-dev}
+TARGET_NAME=ice-$ICE_VERSION-$BUILD
 
 # Build ice cpp from source
 wget -q https://github.com/zeroc-ice/ice/archive/v$ICE_VERSION.tar.gz
 tar xzf v$ICE_VERSION.tar.gz
 cd ice-$ICE_VERSION/cpp
 
-make --silent && make install --silent
+make --silent prefix=/opt/$TARGET_NAME
+make install --silent prefix=/opt/$TARGET_NAME
 
-tar -zcf /dist/Ice-$ICE_VERSION-ubuntu1804-amd64.tar.gz /opt/Ice-3.6.5/
+tar -zcf /dist/$TARGET_NAME-ubuntu1804-amd64.tar.gz -C /opt $TARGET_NAME
 
 # Zeroc IcePy
+# TODO: is it possible to rename the wheel to indicate it's only for Ubuntu?
 pip3 download "zeroc-ice==$ICE_VERSION"
 tar -zxf "zeroc-ice-$ICE_VERSION.tar.gz"
 cd "zeroc-ice-$ICE_VERSION"