Feature/ci distribution

.travis.yml

@@ -1,37 +1,45 @@
-language: python
-python:
-  - '3.5'
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-5
-      - build-essential
-      - cmake
-      - libboost-dev
-      - libboost-filesystem-dev
-env:
-  - CXX=g++-5
+language: cpp
+sudo: true
+dist: xenial
+
+services:
+  - docker
+
+matrix:
+  include:
+    - env: BUILD_TYPE=deb DEBIAN_VERSION=stretch
+    - env: BUILD_TYPE=deb DEBIAN_VERSION=buster
+    - env: BUILD_TYPE=deb DEBIAN_VERSION=stretch CROSS=raspberry-pi
+    - env: BUILD_TYPE=python PYTHON_VERSION=3.5 DEBIAN_VERSION=stretch BUILDER_SDIST=true
+    - env: BUILD_TYPE=python PYTHON_VERSION=3.5 DEBIAN_VERSION=stretch CROSS=raspberry-pi BUILDER_WHEEL=true
+    - env: BUILD_TYPE=python PYTHON_VERSION=3.6 DEBIAN_VERSION=stretch CROSS=raspberry-pi BUILDER_WHEEL=true
+    - env: BUILD_TYPE=python PYTHON_VERSION=3.7 DEBIAN_VERSION=stretch CROSS=raspberry-pi BUILDER_WHEEL=true
+
+install:
+  - ci/scripts/install.sh
+
 script:
-  - pip install -e .
-  - mkdir -p src/build && cd $_
-  - cmake .. -DPYBIND11_PYTHON_VERSION=${TRAVIS_PYTHON_VERSION}
-  - make -j"$(nproc)"
+  - ci/scripts/script.sh
+
 after_success:
-  - cpack -D CPACK_OUTPUT_FILE_PREFIX=dist
+  - ci/scripts/after_success.sh
+
 before_deploy:
+  - ci/scripts/before_deploy.sh
   - cd ${TRAVIS_BUILD_DIR}
+
 deploy:
-- provider: pypi
-  user: "${PYPI_USERNAME}"
-  password: "${PYPI_PASSWORD}"
+- provider: script
+  script: bash ci/scripts/pypi_deploy.sh
+  skip_cleanup: true
   on:
+    condition: "$BUILD_TYPE = python"
     tags: true
-- provider: releases
-  api_key: $GITHUB_OAUTH_TOKEN
+- provider: bintray
+  file: "bintray.json"
+  user: "coord-e"
+  key: $BINTRAY_API_KEY
   skip_cleanup: true
-  file_glob: true
-  file: 'src/build/dist/*'
   on:
+    condition: "$BUILD_TYPE = deb"
     tags: true

ci/bintray.json.in

@@ -0,0 +1,22 @@
+{
+  "package": {
+    "name": "servoarray",
+    "repo": "apt",
+    "subject": "monomotion"
+  },
+  "version": {
+    "name": "@VERSION@"
+  },
+  "files": [
+    {
+      "includePattern": "dist/(.*\.deb)",
+      "uploadPattern": "pool/main/m/servoarray/$1",
+      "matrixParams": {
+        "deb_distribution": "@DEBIAN_VERSION@",
+        "deb_component": "main",
+        "deb_architecture": "@ARCH@"
+      }
+    }
+  ],
+  "publish": true
+}

ci/image/.gitignore

@@ -0,0 +1 @@
+Dockerfile

ci/image/Dockerfile.in

@@ -0,0 +1,10 @@
+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
+
+COPY scripts /scripts
+
+ENTRYPOINT @SHELL@

ci/image/scripts/deb_build.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+# This file is part of servoarray.
+#
+# servoarray is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# servoarray is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with servoarray.  If not, see <http://www.gnu.org/licenses/>.
+
+set -euo pipefail
+
+cd /build
+cmake /source/src -DBUILD_PYTHON=OFF
+make -j"$(nproc)"

ci/image/scripts/deb_package.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# This file is part of servoarray.
+#
+# servoarray is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# servoarray is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with servoarray.  If not, see <http://www.gnu.org/licenses/>.
+
+set -euo pipefail
+
+cd /build
+cpack -D CPACK_OUTPUT_FILE_PREFIX=/dist -D CPACK_GENERATOR=DEB

ci/image/scripts/python_build.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# This file is part of servoarray.
+#
+# servoarray is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# servoarray is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with servoarray.  If not, see <http://www.gnu.org/licenses/>.
+
+set -euo pipefail
+
+cd /source
+pip install -e .
+
+# TODO: perform tests around here

ci/image/scripts/python_package.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+# This file is part of servoarray.
+#
+# servoarray is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# servoarray is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with servoarray.  If not, see <http://www.gnu.org/licenses/>.
+
+set -euo pipefail
+
+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

ci/scripts/after_success.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# This file is part of servoarray.
+#
+# servoarray is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# servoarray is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with servoarray.  If not, see <http://www.gnu.org/licenses/>.
+
+set -euo pipefail
+
+docker run -v $(pwd):/source -v $(pwd)/build:/build -v $(pwd)/dist:/dist --env-file <(env | grep BUILDER_) builder /scripts/${BUILD_TYPE}_package.sh

ci/scripts/before_deploy.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+# This file is part of servoarray.
+#
+# servoarray is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# servoarray is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with servoarray.  If not, see <http://www.gnu.org/licenses/>.
+
+set -euo pipefail
+
+DEB_ARCH=$(docker run builder "dpkg --print-architecture")
+
+cat ci/bintray.json.in \
+  | sed "s/@VERSION@/$(./version.sh)/g" \
+  | sed "s/@DEBIAN_VERSION@/${DEBIAN_VERSION}/g" \
+  | sed "s/@ARCH@/${DEB_ARCH}/g" \
+  > bintray.json

ci/scripts/install.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+# This file is part of servoarray.
+#
+# servoarray is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# servoarray is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with servoarray.  If not, see <http://www.gnu.org/licenses/>.
+
+set -euo pipefail
+
+function base_image_python() {
+  if [ -n "${CROSS:-}" ]; then
+    echo "balenalib/${CROSS}-python:${PYTHON_VERSION}-${DEBIAN_VERSION}-build"
+  else
+    echo "python:${PYTHON_VERSION}-slim-${DEBIAN_VERSION}"
+  fi
+}
+
+function base_image_deb() {
+  if [ -n "${CROSS:-}" ]; then
+    echo "balenalib/${CROSS}:${DEBIAN_VERSION}-build"
+  else
+    echo "debian:${DEBIAN_VERSION}-slim"
+  fi
+}
+
+function base_image() {
+  case ${BUILD_TYPE} in
+    "python" ) base_image_python ;;
+    "deb" ) base_image_deb ;;
+    * ) echo "unknown build type ${BUILD_TYPE}"; exit -1 ;;
+  esac
+}
+
+function cross_sh() {
+  if [ -n "${CROSS:-}" ]; then
+    echo "[\"/usr/bin/qemu-arm-static\", \"-execve\", \"/bin/sh\", \"-c\"]"
+  else
+    echo "[\"/bin/sh\", \"-c\"]"
+  fi
+}
+
+readonly BASE_IMAGE=$(base_image)
+readonly CROSS_SH=$(cross_sh)
+
+echo "BASE_IMAGE=${BASE_IMAGE}"
+cat ci/image/Dockerfile.in \
+  | sed "s/@BASE_IMAGE@/${BASE_IMAGE//\//\\/}/g" \
+  | sed "s/@SHELL@/${CROSS_SH//\//\\/}/g" \
+  > ci/image/Dockerfile
+
+docker build ci/image -t builder

ci/scripts/pypi_deploy.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+# This file is part of servoarray.
+#
+# servoarray is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# servoarray is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with servoarray.  If not, see <http://www.gnu.org/licenses/>.
+
+set -euo pipefail
+
+sudo apt-get update -y
+sudo apt-get install -y python3-setuptools python3-pip
+sudo pip3 install twine
+
+function upload_pypi() {
+  twine upload -u ${PYPI_USERNAME} -p ${PYPI_PASSWORD} $@
+}
+
+${BUILDER_SDIST:-false} && upload_pypi dist/*.tar.gz
+${BUILDER_WHEEL:-false} && upload_pypi dist/*.whl

ci/scripts/script.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# This file is part of servoarray.
+#
+# servoarray is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# servoarray is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with servoarray.  If not, see <http://www.gnu.org/licenses/>.
+
+set -euo pipefail
+
+docker run -v $(pwd):/source -v $(pwd)/build:/build --env-file <(env | grep BUILDER_) builder /scripts/${BUILD_TYPE}_build.sh

src/CMakeLists.txt

@@ -33,7 +33,8 @@ include(config/servoarrayTools.cmake)  # sets SERVOARRAY_DRIVER_SUFFIX
 set(SERVOARRAY_DEFAULT_DRIVER_PATHS ~/.servoarray/ ${CMAKE_INSTALL_PREFIX}/lib/servoarray)
 set(SERVOARRAY_DEFAULT_CONFIG_FILES ~/.servoarrayrc ./.servoarrayrc)
 
-set(Boost_USE_STATIC_LIBS ON)
+option(BUILD_PYTHON "Build servoarray python module" ON)
+
 find_package(Boost 1.36.0 REQUIRED COMPONENTS filesystem system)
 include_directories(${Boost_INCLUDE_DIRS})
 
@@ -51,8 +52,10 @@ add_subdirectory(include)
 add_subdirectory(config)
 add_subdirectory(examples)
 
-add_subdirectory(third_party/pybind11)
-# pybind11 headers produce so many errors with strict compiler options
-include_directories(SYSTEM ${PYBIND11_INCLUDE_DIR})
+if (${BUILD_PYTHON})
+  add_subdirectory(third_party/pybind11)
+  # pybind11 headers produce so many errors with strict compiler options
+  include_directories(SYSTEM ${PYBIND11_INCLUDE_DIR})
 
-add_subdirectory(python)
+  add_subdirectory(python)
+endif()

src/cmake/cpack.cmake

@@ -15,5 +15,7 @@
 
 set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
 set(CPACK_GENERATOR "TGZ;ZIP")
+set(CPACK_PACKAGE_CONTACT "coord.e <me@coord-e.com>")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-filesystem1.62.0")
 
 include(CPack)