diff --git a/.gitignore b/.gitignore index e3c2147..ddbf03c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ .flatpak-builder* kolabnow-repo +kolab-repo kolabnow-build +kolab-build platform-build diff --git a/kube/com.kolab.kube.json b/kube/com.kolab.kube.json new file mode 100644 index 0000000..c385379 --- /dev/null +++ b/kube/com.kolab.kube.json @@ -0,0 +1,39 @@ +{ + "id": "com.kolab.kube", + "branch": "master", + "runtime": "org.freedesktop.Platform", + "runtime-version": "1.6", + "sdk": "org.freedesktop.Sdk", + "command": "kube", + "rename-icon": "kube_icon", + "rename-desktop-file": "org.kde.kube.desktop", + "desktop-file-name-prefix": "(Nightly) ", + "tags": ["nightly"], + "finish-args": [ + "--share=ipc", + "--socket=x11", + "--socket=wayland", + "--device=dri", + "--filesystem=host", + "--share=network", + "--env=SASL_PATH=/usr/lib/sasl2/" + ], + "separate-locales": false, + + "modules": [ + "kubedeps.json", + { + "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib", + "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"], + "name": "sink", + "buildsystem": "cmake-ninja", + "sources": [ { "type": "git", "url": "git://anongit.kde.org/sink.git", "branch": "develop" } ] + }, + { + "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], + "name": "kube", + "buildsystem": "cmake-ninja", + "sources": [ { "type": "git", "url": "git://anongit.kde.org/kube.git", "branch": "develop" } ] + } + ] +} diff --git a/kube/com.kolabnow.kube.json b/kube/com.kolabnow.kube.json index 32c9489..66f5290 100644 --- a/kube/com.kolabnow.kube.json +++ b/kube/com.kolabnow.kube.json @@ -1,101 +1,39 @@ { "id": "com.kolabnow.kube", "branch": "master", "runtime": "org.freedesktop.Platform", "runtime-version": "1.6", "sdk": "org.freedesktop.Sdk", "command": "kube", "rename-icon": "kube_icon", "rename-desktop-file": "org.kde.kube.desktop", "tags": ["nightly"], "desktop-file-name-prefix": "Kolab Now ", "finish-args": [ "--share=ipc", "--socket=x11", "--socket=wayland", "--device=dri", "--filesystem=host", "--share=network", "--env=SASL_PATH=/usr/lib/sasl2/" ], "separate-locales": false, "modules": [ - "qt.json", - "boost.json", - "gpgme.json", - { - "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], - "name": "flatbuffers", - "buildsystem": "cmake-ninja", - "sources": [ { "type": "git", "url": "https://github.com/google/flatbuffers.git", "branch": "v1.6.0" } ] - }, - { - "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib", - "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"], - "name": "kasync", - "buildsystem": "cmake-ninja", - "sources": [ { "type": "git", "url": "git://anongit.kde.org/kasync.git", "branch": "master" } ] - }, - { - "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], - "name": "kmime", - "buildsystem": "cmake-ninja", - "sources": [ { "type": "git", "url": "git://anongit.kde.org/kmime.git", "branch": "Applications/17.04" } ] - }, - { - "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], - "name": "kimap2", - "buildsystem": "cmake-ninja", - "sources": [ { "type": "git", "url": "git://anongit.kde.org/kimap2.git", "branch": "master" } ] - }, - { - "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], - "name": "kcontacts", - "buildsystem": "cmake-ninja", - "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcontacts.git", "branch": "Applications/17.04" } ] - }, - { - "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], - "name": "kdav2", - "buildsystem": "cmake-ninja", - "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdav2.git", "branch": "master" } ] - }, - { - "name": "libgit2", - "buildsystem": "cmake-ninja", - "sources": [ - { - "type": "archive", - "url": "https://github.com/libgit2/libgit2/archive/v0.24.1.tar.gz", - "sha256": "0269ec198c54e44f275f8f51e7391681a03aa45555e2ab6ce60b0757b6bde3de" - } - ] - }, - { - "name": "lmdb", - "sources": [ { "type": "git", "url": "git://github.com/LMDB/lmdb.git", "branch": "LMDB_0.9.18"}], - "no-autogen": true, - "make-install-args": ["prefix=/app"], - "subdir" : "libraries/liblmdb" - }, - { - "name": "curl", - "buildsystem": "cmake-ninja", - "sources": [ { "type": "git", "url": "https://github.com/curl/curl.git", "branch": "curl-7_55_0"} ] - }, + "kubedeps.json", { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib", "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"], "name": "sink", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/sink.git", "branch": "develop" } ] }, { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], "name": "kube", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kube.git", "branch": "kolabnow" } ] } ] } diff --git a/kube/com.kolabnow.kube.json b/kube/kubedeps.json similarity index 69% copy from kube/com.kolabnow.kube.json copy to kube/kubedeps.json index 32c9489..7bcca50 100644 --- a/kube/com.kolabnow.kube.json +++ b/kube/kubedeps.json @@ -1,101 +1,68 @@ { - "id": "com.kolabnow.kube", - "branch": "master", - "runtime": "org.freedesktop.Platform", - "runtime-version": "1.6", - "sdk": "org.freedesktop.Sdk", - "command": "kube", - "rename-icon": "kube_icon", - "rename-desktop-file": "org.kde.kube.desktop", - "tags": ["nightly"], - "desktop-file-name-prefix": "Kolab Now ", - "finish-args": [ - "--share=ipc", - "--socket=x11", - "--socket=wayland", - "--device=dri", - "--filesystem=host", - "--share=network", - "--env=SASL_PATH=/usr/lib/sasl2/" - ], - "separate-locales": false, - + "name": "kubedeps", "modules": [ "qt.json", "boost.json", "gpgme.json", { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], "name": "flatbuffers", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "https://github.com/google/flatbuffers.git", "branch": "v1.6.0" } ] }, { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib", "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"], "name": "kasync", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kasync.git", "branch": "master" } ] }, { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], "name": "kmime", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kmime.git", "branch": "Applications/17.04" } ] }, { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], "name": "kimap2", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kimap2.git", "branch": "master" } ] }, { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], "name": "kcontacts", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcontacts.git", "branch": "Applications/17.04" } ] }, { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], "name": "kdav2", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdav2.git", "branch": "master" } ] }, { "name": "libgit2", "buildsystem": "cmake-ninja", "sources": [ { "type": "archive", "url": "https://github.com/libgit2/libgit2/archive/v0.24.1.tar.gz", "sha256": "0269ec198c54e44f275f8f51e7391681a03aa45555e2ab6ce60b0757b6bde3de" } ] }, { "name": "lmdb", "sources": [ { "type": "git", "url": "git://github.com/LMDB/lmdb.git", "branch": "LMDB_0.9.18"}], "no-autogen": true, "make-install-args": ["prefix=/app"], "subdir" : "libraries/liblmdb" }, { "name": "curl", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "https://github.com/curl/curl.git", "branch": "curl-7_55_0"} ] - }, - { - "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib", - "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"], - "name": "sink", - "buildsystem": "cmake-ninja", - "sources": [ { "type": "git", "url": "git://anongit.kde.org/sink.git", "branch": "develop" } ] - }, - { - "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], - "name": "kube", - "buildsystem": "cmake-ninja", - "sources": [ { "type": "git", "url": "git://anongit.kde.org/kube.git", "branch": "kolabnow" } ] } ] } diff --git a/rebuild.sh b/rebuild.sh deleted file mode 100755 index 8f5bb28..0000000 --- a/rebuild.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -mkdir kolabnow-repo -mkdir platform-build -mkdir kolabnow-build - -#Platform -# flatpak-builder --force-clean --ccache --gpg-homedir=gpg --gpg-sign=3467EC817EDD7956DDFA874C94306134D868808A --repo=kolabnow-repo --subject="Build of org.kolab.Sdk, `date`" platform-build platform/org.kolab.Sdk.json - -# flatpak remote-add --user --no-gpg-verify kolablocal kolabnow-repo/ -# flatpak install --user kolablocal org.kolab.Sdk -# flatpak install --user kolablocal org.kolab.Platform -# flatpak update --user org.kolab.Sdk -# flatpak update --user org.kolab.Platform - -#Kube -flatpak-builder --force-clean --ccache --gpg-homedir=gpg --gpg-sign=3467EC817EDD7956DDFA874C94306134D868808A --repo=kolabnow-repo --subject="Build of Kube `date`" kolabnow-build kube/com.kolabnow.kube.json - -#Finalize -flatpak build-update-repo kolabnow-repo --prune --prune-depth=20 --generate-static-deltas --gpg-homedir=gpg --gpg-sign=3467EC817EDD7956DDFA874C94306134D868808A -#This is only necessary if not building signed from start -flatpak build-sign kolabnow-repo com.kolabnow.kube --gpg-homedir=gpg --gpg-sign=3467EC817EDD7956DDFA874C94306134D868808A diff --git a/rebuildkolab.sh b/rebuildkolab.sh new file mode 100755 index 0000000..2d1a4d3 --- /dev/null +++ b/rebuildkolab.sh @@ -0,0 +1,10 @@ +#!/bin/bash +mkdir kolab-repo +mkdir kolab-build + +#Kube +flatpak-builder --force-clean --ccache --gpg-homedir=gpg --gpg-sign=3467EC817EDD7956DDFA874C94306134D868808A --repo=kolab-repo --subject="Build of Kube `date`" kolab-build kube/org.kolab.kube.json || exit 1 +#Finalize +flatpak build-update-repo kolab-repo --prune --prune-depth=20 --generate-static-deltas --gpg-homedir=gpg --gpg-sign=3467EC817EDD7956DDFA874C94306134D868808A || exit 1 +#This is only necessary if not building signed from start +flatpak build-sign kolab-repo org.kolab.kube --gpg-homedir=gpg --gpg-sign=3467EC817EDD7956DDFA874C94306134D868808A || exit 1 diff --git a/rebuildkolabnow.sh b/rebuildkolabnow.sh new file mode 100755 index 0000000..65c4699 --- /dev/null +++ b/rebuildkolabnow.sh @@ -0,0 +1,10 @@ +#!/bin/bash +mkdir kolabnow-repo +mkdir kolabnow-build + +#Kube +flatpak-builder --force-clean --ccache --gpg-homedir=gpg --gpg-sign=3467EC817EDD7956DDFA874C94306134D868808A --repo=kolabnow-repo --subject="Build of Kube `date`" kolabnow-build kube/com.kolabnow.kube.json || exit 1 +#Finalize +flatpak build-update-repo kolabnow-repo --prune --prune-depth=20 --generate-static-deltas --gpg-homedir=gpg --gpg-sign=3467EC817EDD7956DDFA874C94306134D868808A || exit 1 +#This is only necessary if not building signed from start +flatpak build-sign kolabnow-repo com.kolabnow.kube --gpg-homedir=gpg --gpg-sign=3467EC817EDD7956DDFA874C94306134D868808A || exit 1 diff --git a/uploadkolab.sh b/uploadkolab.sh new file mode 100755 index 0000000..0068f21 --- /dev/null +++ b/uploadkolab.sh @@ -0,0 +1,3 @@ +#!/bin/bash +UPLOADDIR=/var/www/kolab.org/kube/public_html/kube/flatpak +./ostreesync.py --rsync-opt='-P' --src kolab-repo/ --dest mollekopf@10.9.2.98:$UPLOADDIR/repo/ || exit 1 diff --git a/upload.sh b/uploadkolabnow.sh similarity index 62% rename from upload.sh rename to uploadkolabnow.sh index 782396c..f590b86 100755 --- a/upload.sh +++ b/uploadkolabnow.sh @@ -1,10 +1,6 @@ #!/bin/bash - UPLOADDIR=/var/www/kolabnow.com/kube/public_html/kube/flatpak #The ostreesync script avoids race conditions if people are accessing the mirror while we're uploading stuff. -# rsync -Paz -e ssh kolabnow-repo/ mollekopf@10.9.2.98:$UPLOADDIR/repo/ -./ostreesync.py --rsync-opt='-P' --src kolabnow-repo/ --dest mollekopf@10.9.2.98:$UPLOADDIR/repo/ - -# scp platform/kolabruntime.flatpakrepo mollekopf@10.9.2.98:$UPLOADDIR/ -scp kube/com.kolabnow.kube.flatpakref mollekopf@10.9.2.98:$UPLOADDIR/ +./ostreesync.py --rsync-opt='-P' --src kolabnow-repo/ --dest mollekopf@10.9.2.98:$UPLOADDIR/repo/ || exit 1 +scp kube/com.kolabnow.kube.flatpakref mollekopf@10.9.2.98:$UPLOADDIR/ || exit 1