Merge pull request #21 from MonoMotion/bugfix/fix-deployment-errors

Bugfix/fix deployment errors

Author: coord-e

ci/bintray.json.in

@@ -2,7 +2,11 @@
   "package": {
     "name": "servoarray",
     "repo": "apt",
-    "subject": "monomotion"
+    "subject": "monomotion",
+    "licenses": ["GPL-3.0-or-later"],
+    "website_url": "https://github.com/MonoMotion/servoarray",
+    "issue_tracker_url": "https://github.com/MonoMotion/servoarray/issues",
+    "vcs_url": "https://github.com/MonoMotion/servoarray.git"
   },
   "version": {
     "name": "@VERSION@"

ci/image/Dockerfile.in

@@ -3,7 +3,7 @@ FROM @BASE_IMAGE@
 SHELL @SHELL@
 
 RUN apt-get update -y \
-  && apt-get install -y --no-install-recommends libboost-dev libboost-filesystem-dev cmake build-essential
+  && apt-get install -y --no-install-recommends libboost-dev libboost-filesystem-dev cmake git build-essential
 
 COPY scripts /scripts
 

ci/image/scripts/deb_package.sh

@@ -17,4 +17,17 @@
 set -euo pipefail
 
 cd /build
-cpack -D CPACK_OUTPUT_FILE_PREFIX=/dist -D CPACK_GENERATOR=DEB
+
+function package_filename() {
+  local sa_version=$(/source/version.sh)
+  local arch=$(dpkg --print-architecture)
+
+  . /etc/os-release
+  if [ -n "${VERSION_ID:-}" ]; then
+    echo "servoarray_${sa_version}-deb${VERSION_ID}_${arch}"
+  else
+    echo "servoarray_${sa_version}_${arch}"
+  fi
+}
+
+cpack -D CPACK_OUTPUT_FILE_PREFIX=/dist -D CPACK_GENERATOR=DEB -D CPACK_PACKAGE_FILE_NAME=$(package_filename)

ci/image/scripts/python_package.sh

@@ -21,3 +21,6 @@ pip install --upgrade setuptools pip wheel
 cd /source
 ${BUILDER_SDIST:-false} && python setup.py sdist -d /dist
 ${BUILDER_WHEEL:-false} && python setup.py bdist_wheel -d /dist
+
+# tell travis that this is success
+true

src/cmake/cpack.cmake

@@ -18,4 +18,8 @@ set(CPACK_GENERATOR "TGZ;ZIP")
 set(CPACK_PACKAGE_CONTACT "coord.e <me@coord-e.com>")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-filesystem1.62.0")
 
+set(CPACK_PACKAGE_VERSION_MAJOR ${servoarray_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${servoarray_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${servoarray_VERSION_PATCH})
+
 include(CPack)