diff --git a/.travis.yml b/.travis.yml index 488b2bd..b682721 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,27 @@ sudo: required - +language: python +python: '3.6' services: - docker - install: -- if [[ -z "${TRAVIS_TAG}" ]]; then - make docker-pull -- fi - +- pip3 install . script: -- if [[ -z "${TRAVIS_TAG}" ]]; then -- make docker-env-build -- fi - +- package/update_version.sh $TRAVIS_TAG deploy: - provider: releases - api_key: - secure: zFbsCIKcsvWU/Yc+9k294Qj8QY48VlkV8DSScP5gz6dQegeUSaSHI/YafherkFQ0B03bIY8yc7roMtDo7HAkEnPptjFhdUiOFI11+xDVb3s7Y8Ek2nV3znQzdtR4CR/94l3in6R3DH+eNA6+6Je/NIWLdVcvRX07RBSfBVdPmnsAyAD9KNTsl8Q4c20HgtLNxfWv2s5eCyD+heCTLYrErEZKZ5vYeeANmWomHvT2ED/4QerpBP8wkh59QXD1S79CF7oyq6X173ZJUQVxdBP+OSXt/mDBAoqf+TV6okawRZn48JluvCWAJ7BceX7t9emd1rVI/s8t3wCP+eMcmNn5g/6UJaCPnTJ5YplTuUWRc63UFSkE0AY8WYcRlrz+/OiXYgQ8LMXfN23aWgarHCbS2vHR3Afu9gpLCoKucr36hKhs3zfjJzVLFFW16mnbaTFcBzfDDRpkvOANB1aZwGVRFpTIWIMjkn0+lxWTC/moIJvQlfRPsC4dN5cDAilRQlguHzayebtGE8X0PuIe9A8bkET3V/y+KPnQiSJ7J+5PNoDSdqRAE4IKvVOLEyHtlqBVkvIHKnugUnWPIZ21gm5RemMEj9/YGa8Efwz7PIKtJJ3kFMGDYKVlIKyB+rg/TFWNdo6jjevnWM6y4SfVI3kFyjA+mp31o6nshrQy0zVQpd8= - file: - - package/debian/build/virtscreen_0.2.0-1_all.deb - on: - tags: true - repo: kbumsik/VirtScreen + - provider: releases + api_key: + secure: zFbsCIKcsvWU/Yc+9k294Qj8QY48VlkV8DSScP5gz6dQegeUSaSHI/YafherkFQ0B03bIY8yc7roMtDo7HAkEnPptjFhdUiOFI11+xDVb3s7Y8Ek2nV3znQzdtR4CR/94l3in6R3DH+eNA6+6Je/NIWLdVcvRX07RBSfBVdPmnsAyAD9KNTsl8Q4c20HgtLNxfWv2s5eCyD+heCTLYrErEZKZ5vYeeANmWomHvT2ED/4QerpBP8wkh59QXD1S79CF7oyq6X173ZJUQVxdBP+OSXt/mDBAoqf+TV6okawRZn48JluvCWAJ7BceX7t9emd1rVI/s8t3wCP+eMcmNn5g/6UJaCPnTJ5YplTuUWRc63UFSkE0AY8WYcRlrz+/OiXYgQ8LMXfN23aWgarHCbS2vHR3Afu9gpLCoKucr36hKhs3zfjJzVLFFW16mnbaTFcBzfDDRpkvOANB1aZwGVRFpTIWIMjkn0+lxWTC/moIJvQlfRPsC4dN5cDAilRQlguHzayebtGE8X0PuIe9A8bkET3V/y+KPnQiSJ7J+5PNoDSdqRAE4IKvVOLEyHtlqBVkvIHKnugUnWPIZ21gm5RemMEj9/YGa8Efwz7PIKtJJ3kFMGDYKVlIKyB+rg/TFWNdo6jjevnWM6y4SfVI3kFyjA+mp31o6nshrQy0zVQpd8= + file: + - "package/debian/build/virtscreen_$TRAVIS_TAG-1_all.deb" + on: + tags: true + repo: kbumsik/VirtScreen + - provider: pypi + user: kbumsik + password: + secure: d7ozcWf9/j2mpyYX60o7yo/0dPnTkA/1FxPm6GV3bst264z1NVh4G4+J0o/jIpLKA9lEd5QbBUgnLnNIBGGBeEghYCeof/yZnekCntYd75tIAiaIkwBzaYu3n5wfxpEVUIDngTh+biH4EU4iq+Kxrg/KxMi+MetFWL6EVJgtIUarjr2wkBYmKAOEkNvyXWkIEJqUn0xuQSGmqGyNxRjoAPv+6i9QR7KnTCaEPOrEzwKyxhzOL33acBrmaymRFC7EznmaTIHMzGqBcaj3rljC6Kk5bnepSzncNTT8C4v8MuJZPF+oYPN5n16Xy4odAJlt1+pWsuAbhB6Gk/l5Z0zoKjIIuH2LkMWkm2MDO3qbmuu9qfEWg1Y+MmbhnVQf+1qRO7i0vMt9WP5X6IDPkBeXYibUiFZVwYY2AmBchRCD7XvIL1+0JEGQadtAR8EJWNPKCpRgl3p9WTyMVtGgob/UEzknRJWDAYk4u3R4yiMw+shqdc/osRyjoadVQZFZs/80QqLTBUFkR3XlBfNmyywtu3ux9PNnCEgoPO28K6EWj70UaujN87ByjFQ1b4n+wuWwFkp5PTJYLSHgXI8oR29VB9xk4mmKNU4MnAApokgbs4Gqb3jY6KHm5t/MIMqYcrOrqT8OYqwpvfie1FMLXvvtowcgVnUup7vOAaq9mafZpJI= + distributions: "bdist_wheel" + on: + tags: true + repo: kbumsik/VirtScreen \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index b072ba5..92a81d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app CMD ["/bin/bash"] RUN apt-get update && \ - apt-get install -y python3-all python3-pip fakeroot debmake debhelper fakeroot wget tar && \ + apt-get install -y python3-all python3-pip python3-wheel fakeroot debmake debhelper fakeroot wget tar && \ apt-get autoremove -y && \ ln /usr/bin/python3 /usr/bin/python && \ ln /usr/bin/pip3 /usr/bin/pip && \ diff --git a/package/archlinux/.SRCINFO b/package/archlinux/.SRCINFO index a43f6f5..f5538dc 100644 --- a/package/archlinux/.SRCINFO +++ b/package/archlinux/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = virtscreen pkgdesc = Make your iPad/tablet/computer as a secondary monitor on Linux - pkgver = 0.2.0 + pkgver = 0.2.1 pkgrel = 1 url = https://github.com/kbumsik/VirtScreen arch = i686 @@ -15,8 +15,7 @@ pkgbase = virtscreen depends = python-qt5reactor optdepends = arandr: for display settings option provides = virtscreen - source = https://github.com/kbumsik/VirtScreen/archive/0.2.0.tar.gz - sha256sums = 73cb4016b06ccb7a18a7aefc5822119655f1c260915bc34218d3b04ac86af3d8 + source = https://github.com/kbumsik/VirtScreen/archive/0.2.1.tar.gz pkgname = virtscreen diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index af14cb9..d08a36c 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Bumsik Kim _pkgname_camelcase=VirtScreen pkgname=virtscreen -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc="Make your iPad/tablet/computer as a secondary monitor on Linux" arch=("i686" "x86_64") @@ -22,7 +22,7 @@ install= changelog= source=(https://github.com/kbumsik/$_pkgname_camelcase/archive/$pkgver.tar.gz) noextract=() -sha256sums=('73cb4016b06ccb7a18a7aefc5822119655f1c260915bc34218d3b04ac86af3d8') +sha256sums=('') package() { cd $_pkgname_camelcase-$pkgver diff --git a/package/debian/_common.sh b/package/debian/_common.sh index 19377b7..5f305e2 100644 --- a/package/debian/_common.sh +++ b/package/debian/_common.sh @@ -1,6 +1,6 @@ #!/bin/bash -PKGVER=0.2.0 +PKGVER=0.2.1 # Required for debmake DEBEMAIL="k.bumsik@gmail.com" DEBFULLNAME="Bumsik Kim" diff --git a/package/update_version.sh b/package/update_version.sh new file mode 100755 index 0000000..e72bb31 --- /dev/null +++ b/package/update_version.sh @@ -0,0 +1,52 @@ +#!/bin/env bash + +# Get parameters. Just return 0 if no parameter passed +if [ -n "$1" ]; then + VERSION=$1 +else + exit 0 +fi + +# Directory +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +ROOT=$DIR/.. + +override_version () { + # Update python setup.py + perl -pi -e "s/version=\'\d+\.\d+\.\d+\'/version=\'$VERSION\'/" \ + $ROOT/setup.py + # Update .json files in the module + perl -pi -e "s/\"version\"\s*\:\s*\"\d+\.\d+\.\d+\"/\"version\"\: \"$VERSION\"/" \ + $ROOT/virtscreen/assets/data.json + perl -pi -e "s/\"version\"\s*\:\s*\"\d+\.\d+\.\d+\"/\"version\"\: \"$VERSION\"/" \ + $ROOT/virtscreen/assets/config.default.json + # Arch AUR + perl -pi -e "s/pkgver=\d+\.\d+\.\d+/pkgver=$VERSION/" \ + $ROOT/package/archlinux/PKGBUILD + # Debian + perl -pi -e "s/PKGVER=\d+\.\d+\.\d+/PKGVER=$VERSION/" \ + $ROOT/package/debian/_common.sh +} + +build_pypi () { + make -C $ROOT python-wheel +} + +build_arch () { + wget -q https://github.com/kbumsik/VirtScreen/archive/$VERSION.tar.gz + SHA256=$(sha256sum $VERSION.tar.gz | cut -d' ' -f1) + # Arch AUR + perl -pi -e "s/sha256sums=\('.*'\)/sha256sums=('$SHA256')/" \ + $ROOT/package/archlinux/PKGBUILD + rm $VERSION.tar.gz + make -C $ROOT arch-update +} + +build_debian () { + make -C $ROOT deb-env-build +} + +override_version +build_pypi +build_arch +build_debian diff --git a/setup.py b/setup.py index ae63654..2300b3d 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ setup( # For a discussion on single-sourcing the version across setup.py and the # project code, see # https://packaging.python.org/en/latest/single_source_version.html - version='0.2.0', # Required + version='0.2.1', # Required # This is a one-line description or tagline of what your project does. This # corresponds to the "Summary" metadata field: diff --git a/virtscreen/assets/config.default.json b/virtscreen/assets/config.default.json index 3c018c2..38ccdd3 100644 --- a/virtscreen/assets/config.default.json +++ b/virtscreen/assets/config.default.json @@ -1,5 +1,5 @@ { - "version": "0.3.0", + "version": "0.2.1", "x11vncVersion": "0.9.15", "theme_color": 8, "virt": { diff --git a/virtscreen/assets/data.json b/virtscreen/assets/data.json index 70c2f33..9d111d7 100644 --- a/virtscreen/assets/data.json +++ b/virtscreen/assets/data.json @@ -1,5 +1,5 @@ { - "version": "0.3.0", + "version": "0.2.1", "x11vncOptions": { "-ncache": { "value": "-ncache",