pkg/pkg.pri

@@ -7,7 +7,4 @@ DISTFILES += \
     $${PWD}/ubuntu/debian/ocs-url.install \
     $${PWD}/fedora/ocs-url.spec \
     $${PWD}/opensuse/ocs-url.spec \
-    $${PWD}/archlinux/PKGBUILD \
-    $${PWD}/snap/snapcraft.yaml \
-    $${PWD}/snap/snap/gui/ocs-url.desktop \
-    $${PWD}/appimage/appimage.sh
+    $${PWD}/archlinux/PKGBUILD

pkg/snap/snap/gui/ocs-url.desktop

-[Desktop Entry]
-Name=ocs-url
-Exec=ocs-url.ocs-url %u
-Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/ocs-url.svg
-Type=Application
-Terminal=false
-NoDisplay=true
-Categories=Network;Utility;
-MimeType=x-scheme-handler/ocs;x-scheme-handler/ocss;x-scheme-handler/xdg;x-scheme-handler/xdgs;

pkg/snap/snapcraft.yaml

-name: ocs-url
-version: '0.0.0'
-summary: OCS-URL
-description: |
-  An install helper program for items served on OpenCollaborationServices (OCS).
-
-grade: devel
-confinement: strict
-
-icon: desktop/ocs-url.svg
-
-parts:
-  ocs-url:
-    prepare: |
-      sh scripts/import.sh
-    plugin: qmake
-    source: ./
-    qt-version: qt5
-    options:
-      - PREFIX="/usr"
-    build-packages:
-      - build-essential
-      - qt5-default
-      - libqt5svg5-dev
-      - qtdeclarative5-dev
-      - git
-      - snapcraft
-    stage-packages:
-      - libqt5svg5
-      - qml-module-qtquick-controls
-    after:
-      - desktop-qt5
-
-apps:
-  ocs-url:
-    command: usr/bin/ocs-url
-    plugs:
-      - home
-      - network
-      - opengl
-      - x11
-      - unity7

pkg/ubuntu/debian/changelog

+ocs-url (3.1.0-0ubuntu1) trusty; urgency=low
+
+  * Drop old xdg:// and xdgs:// schemes
+  * Update library
+
+ -- Akira Ohgaki <akiraohgaki@gmail.com>  Thu, 05 Jul 2018 05:43:18 +0000
+
+ocs-url (3.0.3-0ubuntu1) trusty; urgency=low
+
+  * Update library
+  * Fix spelling
+
+ -- Akira Ohgaki <akiraohgaki@gmail.com>  Tue, 06 Feb 2018 12:00:06 +0000
+
 ocs-url (3.0.2-0ubuntu1) trusty; urgency=low
 
   * Add zh_TW translations (by s8321414)

pkg/ubuntu/debian/control

@@ -2,11 +2,11 @@ Source: ocs-url
 Section: web
 Priority: optional
 Maintainer: Akira Ohgaki <akiraohgaki@gmail.com>
-Build-Depends: build-essential, qt5-default (>= 5.2.0), libqt5svg5-dev (>= 5.2.0), qtdeclarative5-dev (>= 5.2.0), git, devscripts, debhelper, fakeroot
+Build-Depends: git, build-essential, qt5-default (>= 5.2.0), libqt5svg5-dev (>= 5.2.0), qtdeclarative5-dev (>= 5.2.0), devscripts, debhelper, fakeroot
 Standards-Version: 3.9.4
 
 Package: ocs-url
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqt5svg5 (>= 5.2.0), qml-module-qtquick2 (>= 5.2.0) | qtdeclarative5-qtquick2-plugin (>= 5.2.0), qml-module-qtquick-window2 (>= 5.2.0) | qtdeclarative5-window-plugin (>= 5.2.0), qml-module-qtquick-controls (>= 5.2.0) | qtdeclarative5-controls-plugin (>= 5.2.0)
 Description: OCS-URL
- An install helper program for items served on OpenCollaborationServices (OCS).
+ An install helper program for items served via OpenCollaborationServices (ocs://).

pkg/ubuntu/debian/copyright

 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ocs-url
 Upstream-Contact: Opendesktop.org <contact@opendesktop.org>
-Source: https://github.com/opendesktop/ocs-url
+Source: https://git.opendesktop.org/akiraohgaki/ocs-url
 
 Files: *
-Copyright: 2016-2017, Opendesktop.org
+Copyright: 2016-2019, Opendesktop.org
 License: GPL-3+
  On Debian systems, the full text of the GNU General Public License version 3
  can be found in the `/usr/share/common-licenses/GPL-3' file.

pkg/ubuntu/debian/rules

@@ -4,8 +4,8 @@
 	dh $@
 
 override_dh_auto_configure:
-	sh scripts/import.sh
-	qmake PREFIX="/usr"
+	./scripts/prepare
+	qmake PREFIX=/usr
 
 override_dh_auto_install:
 	make INSTALL_ROOT="$(CURDIR)/debian/tmp" install

scripts/build-docker.sh

-#!/bin/bash
-
-################################################################################
-# This is wrapper script for build.sh use from inside docker container
-################################################################################
-
-PKGNAME='ocs-url'
-
-PKGUSER='pkgbuilder'
-
-BUILDTYPE=''
-if [ "${1}" ]; then
-    BUILDTYPE="${1}"
-fi
-
-PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
-
-BUILDSCRIPT="${PROJDIR}/scripts/build.sh"
-
-TRANSFERLOG="${PROJDIR}/transfer.log"
-
-transfer_file() {
-    filepath="${1}"
-    if [ -f "${filepath}" ]; then
-        filename="$(basename "${filepath}")"
-        echo "Uploading ${filename}" >> "${TRANSFERLOG}"
-        curl -T "${filepath}" "https://transfer.sh/${filename}" >> "${TRANSFERLOG}"
-        echo "" >> "${TRANSFERLOG}"
-    fi
-}
-
-build_ubuntu() {
-    # docker-image: ubuntu:14.04
-    apt update -qq
-    apt -y install build-essential qt5-default libqt5svg5-dev qtdeclarative5-dev
-    apt -y install git devscripts debhelper fakeroot
-    apt -y install curl
-
-    useradd -m ${PKGUSER}
-    export HOME="/home/${PKGUSER}"
-    chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}"
-
-    su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER}
-
-    transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.deb")"
-}
-
-build_fedora() {
-    # docker-image: fedora:20
-    yum -y install make automake gcc gcc-c++ libtool qt5-qtbase-devel qt5-qtsvg-devel qt5-qtdeclarative-devel
-    yum -y install git rpm-build
-    yum -y install curl
-    # docker-image: fedora:22
-    #dnf -y install make automake gcc gcc-c++ libtool qt5-qtbase-devel qt5-qtsvg-devel qt5-qtdeclarative-devel
-    #dnf -y install git rpm-build
-    #dnf -y install curl
-
-    useradd -m ${PKGUSER}
-    export HOME="/home/${PKGUSER}"
-    chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}"
-
-    su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER}
-
-    transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.rpm")"
-}
-
-build_opensuse() {
-    # docker-image: opensuse:42.1
-    zypper --non-interactive refresh
-    zypper --non-interactive install make automake gcc gcc-c++ libtool libqt5-qtbase-devel libqt5-qtsvg-devel libqt5-qtdeclarative-devel
-    zypper --non-interactive install git rpm-build
-    zypper --non-interactive install curl
-
-    useradd -m ${PKGUSER}
-    export HOME="/home/${PKGUSER}"
-    chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}"
-
-    su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER}
-
-    transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.rpm")"
-}
-
-build_archlinux() {
-    # docker-image: base/archlinux:latest
-    pacman -Syu --noconfirm
-    pacman -S --noconfirm base-devel qt5-base qt5-svg qt5-declarative qt5-quickcontrols
-    pacman -S --noconfirm git
-    pacman -S --noconfirm curl
-
-    useradd -m ${PKGUSER}
-    export HOME="/home/${PKGUSER}"
-    chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}"
-
-    su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER}
-
-    transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.pkg.tar.xz")"
-}
-
-build_snap() {
-    # docker-image: ubuntu:16.04
-    apt update -qq
-    apt -y install build-essential qt5-default libqt5svg5-dev qtdeclarative5-dev
-    apt -y install git snapcraft
-    apt -y install curl
-
-    useradd -m ${PKGUSER}
-    export HOME="/home/${PKGUSER}"
-    chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}"
-
-    su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER}
-
-    transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.snap")"
-}
-
-build_flatpak() {
-    echo 'Not implemented yet'
-}
-
-build_appimage() {
-    # docker-image: ubuntu:14.04
-    apt update -qq
-    apt -y install build-essential qt5-default libqt5svg5-dev qtdeclarative5-dev
-    apt -y install git
-    apt -y install curl
-
-    useradd -m ${PKGUSER}
-    export HOME="/home/${PKGUSER}"
-    chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}"
-
-    su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER}
-
-    transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.AppImage")"
-}
-
-if [ "${BUILDTYPE}" = 'ubuntu' ]; then
-    build_ubuntu
-elif [ "${BUILDTYPE}" = 'fedora' ]; then
-    build_fedora
-elif [ "${BUILDTYPE}" = 'opensuse' ]; then
-    build_opensuse
-elif [ "${BUILDTYPE}" = 'archlinux' ]; then
-    build_archlinux
-elif [ "${BUILDTYPE}" = 'snap' ]; then
-    build_snap
-elif [ "${BUILDTYPE}" = 'flatpak' ]; then
-    build_flatpak
-elif [ "${BUILDTYPE}" = 'appimage' ]; then
-    build_appimage
-else
-    echo "sh $(basename "${0}") [ubuntu|fedora|archlinux|snap|flatpak|appimage]"
-    exit 1
-fi

scripts/build.sh

-#!/bin/bash
-
-################################################################################
-# This is utility script to build distribution packages
-################################################################################
-
-PKGNAME='ocs-url'
-
-BUILDTYPE=''
-if [ "${1}" ]; then
-    BUILDTYPE="${1}"
-fi
-
-PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
-
-BUILDVER="$(cd "${PROJDIR}" && git describe --always)"
-
-BUILDDIR="${PROJDIR}/build_${PKGNAME}_${BUILDVER}_${BUILDTYPE}"
-
-SRCARCHIVE="${BUILDDIR}/${PKGNAME}.tar.gz"
-
-export_srcarchive() {
-    filepath="${1}"
-    $(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${filepath}" HEAD)
-}
-
-build_ubuntu() {
-    cd "${PROJDIR}"
-    mkdir -p "${BUILDDIR}"
-    export_srcarchive "${SRCARCHIVE}"
-
-    tar -xzvf "${SRCARCHIVE}" -C "${BUILDDIR}"
-    cp -r "${PROJDIR}/pkg/ubuntu/debian" "${BUILDDIR}/${PKGNAME}"
-    cd "${BUILDDIR}/${PKGNAME}"
-    debuild -uc -us -b
-}
-
-build_fedora() {
-    cd "${PROJDIR}"
-    mkdir -p "${BUILDDIR}"
-    export_srcarchive "${SRCARCHIVE}"
-
-    mkdir "${BUILDDIR}/SOURCES"
-    mkdir "${BUILDDIR}/SPECS"
-    mv "${SRCARCHIVE}" "${BUILDDIR}/SOURCES"
-    cp "${PROJDIR}/pkg/fedora/${PKGNAME}.spec" "${BUILDDIR}/SPECS"
-    rpmbuild --define "_topdir ${BUILDDIR}" -bb "${BUILDDIR}/SPECS/${PKGNAME}.spec"
-}
-
-build_opensuse() {
-    cd "${PROJDIR}"
-    mkdir -p "${BUILDDIR}"
-    export_srcarchive "${SRCARCHIVE}"
-
-    mkdir "${BUILDDIR}/SOURCES"
-    mkdir "${BUILDDIR}/SPECS"
-    mv "${SRCARCHIVE}" "${BUILDDIR}/SOURCES"
-    cp "${PROJDIR}/pkg/opensuse/${PKGNAME}.spec" "${BUILDDIR}/SPECS"
-    rpmbuild --define "_topdir ${BUILDDIR}" -bb "${BUILDDIR}/SPECS/${PKGNAME}.spec"
-}
-
-build_archlinux() {
-    cd "${PROJDIR}"
-    mkdir -p "${BUILDDIR}"
-    export_srcarchive "${SRCARCHIVE}"
-
-    cp "${PROJDIR}/pkg/archlinux/PKGBUILD" "${BUILDDIR}"
-    cd "${BUILDDIR}"
-    updpkgsums
-    makepkg -s
-}
-
-build_snap() {
-    cd "${PROJDIR}"
-    mkdir -p "${BUILDDIR}"
-    export_srcarchive "${SRCARCHIVE}"
-
-    tar -xzvf "${SRCARCHIVE}" -C "${BUILDDIR}"
-    cp "${PROJDIR}/pkg/snap/snapcraft.yaml" "${BUILDDIR}/${PKGNAME}"
-    cp -r "${PROJDIR}/pkg/snap/snap" "${BUILDDIR}/${PKGNAME}"
-    cd "${BUILDDIR}/${PKGNAME}"
-    snapcraft
-}
-
-build_flatpak() {
-    echo 'Not implemented yet'
-}
-
-build_appimage() {
-    cd "${PROJDIR}"
-    mkdir -p "${BUILDDIR}"
-    export_srcarchive "${SRCARCHIVE}"
-
-    tar -xzvf "${SRCARCHIVE}" -C "${BUILDDIR}"
-    cp "${PROJDIR}/pkg/appimage/appimage.sh" "${BUILDDIR}/${PKGNAME}"
-    cd "${BUILDDIR}/${PKGNAME}"
-    sh appimage.sh
-}
-
-if [ "${BUILDTYPE}" = 'ubuntu' ]; then
-    build_ubuntu
-elif [ "${BUILDTYPE}" = 'fedora' ]; then
-    build_fedora
-elif [ "${BUILDTYPE}" = 'opensuse' ]; then
-    build_opensuse
-elif [ "${BUILDTYPE}" = 'archlinux' ]; then
-    build_archlinux
-elif [ "${BUILDTYPE}" = 'snap' ]; then
-    build_snap
-elif [ "${BUILDTYPE}" = 'flatpak' ]; then
-    build_flatpak
-elif [ "${BUILDTYPE}" = 'appimage' ]; then
-    build_appimage
-else
-    echo "sh $(basename "${0}") [ubuntu|fedora|archlinux|snap|flatpak|appimage]"
-    exit 1
-fi

scripts/import.sh

-#!/bin/bash
-
-################################################################################
-# This is utility script to import build dependencies
-################################################################################
-
-PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
-
-if [ ! -d "${PROJDIR}/lib/qtlib" ]; then
-    git clone https://github.com/akiraohgaki/qtlib.git -b release-0.2.1 --single-branch --depth=1 "${PROJDIR}/lib/qtlib"
-fi

scripts/package

+#!/bin/bash
+
+PKGNAME='ocs-url'
+
+PKGUSER='pkgbuilder'
+
+PKGSCRIPT="${0}"
+
+PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
+
+BUILDDIR="${PROJDIR}/build_${PKGNAME}"
+
+ubuntu_deb() { # docker-image: ubuntu:14.04
+    install_build_deps_ubuntu_deb
+    add_pkguser
+    su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_ubuntu_deb" ${PKGUSER}
+}
+
+install_build_deps_ubuntu_deb() {
+    apt update -qq
+    apt -y install curl git
+    apt -y install build-essential qt5-default libqt5svg5-dev qtdeclarative5-dev
+    apt -y install devscripts debhelper fakeroot
+}
+
+build_ubuntu_deb() {
+    rm -rf "${BUILDDIR}"
+    mkdir -p "${BUILDDIR}"
+    export_srcarchive "${BUILDDIR}/${PKGNAME}.tar.gz"
+    tar -xzf "${BUILDDIR}/${PKGNAME}.tar.gz" -C "${BUILDDIR}"
+    cp -r "${PROJDIR}/pkg/ubuntu/debian" "${BUILDDIR}/${PKGNAME}"
+    cd "${BUILDDIR}/${PKGNAME}"
+    debuild -uc -us -b
+}
+
+fedora_rpm() { # docker-image: fedora:20
+    install_build_deps_fedora_rpm
+    add_pkguser
+    su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_fedora_rpm" ${PKGUSER}
+}
+
+install_build_deps_fedora_rpm() {
+    yum -y install curl git
+    yum -y install make automake gcc gcc-c++ libtool qt5-qtbase-devel qt5-qtsvg-devel qt5-qtdeclarative-devel
+    yum -y install rpm-build
+}
+
+build_fedora_rpm() {
+    rm -rf "${BUILDDIR}"
+    mkdir -p "${BUILDDIR}"
+    mkdir "${BUILDDIR}/SOURCES"
+    mkdir "${BUILDDIR}/SPECS"
+    export_srcarchive "${BUILDDIR}/SOURCES/${PKGNAME}.tar.gz"
+    cp "${PROJDIR}/pkg/fedora/${PKGNAME}.spec" "${BUILDDIR}/SPECS"
+    rpmbuild --define "_topdir ${BUILDDIR}" -bb "${BUILDDIR}/SPECS/${PKGNAME}.spec"
+}
+
+opensuse_rpm() { # docker-image: opensuse:42.3
+    install_build_deps_opensuse_rpm
+    add_pkguser
+    su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_opensuse_rpm" ${PKGUSER}
+}
+
+install_build_deps_opensuse_rpm() {
+    zypper --non-interactive refresh
+    zypper --non-interactive install curl git
+    zypper --non-interactive install make automake gcc gcc-c++ libtool libqt5-qtbase-devel libqt5-qtsvg-devel libqt5-qtdeclarative-devel
+    zypper --non-interactive install rpm-build
+}
+
+build_opensuse_rpm() {
+    rm -rf "${BUILDDIR}"
+    mkdir -p "${BUILDDIR}"
+    mkdir "${BUILDDIR}/SOURCES"
+    mkdir "${BUILDDIR}/SPECS"
+    export_srcarchive "${BUILDDIR}/SOURCES/${PKGNAME}.tar.gz"
+    cp "${PROJDIR}/pkg/opensuse/${PKGNAME}.spec" "${BUILDDIR}/SPECS"
+    rpmbuild --define "_topdir ${BUILDDIR}" -bb "${BUILDDIR}/SPECS/${PKGNAME}.spec"
+}
+
+archlinux_pkg() { # docker-image: archlinux/base:latest
+    install_build_deps_archlinux_pkg
+    add_pkguser
+    su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_archlinux_pkg" ${PKGUSER}
+}
+
+install_build_deps_archlinux_pkg() {
+    pacman -Syu --noconfirm
+    pacman -S --noconfirm curl git
+    pacman -S --noconfirm base-devel qt5-base qt5-svg qt5-declarative qt5-quickcontrols
+    pacman -S --noconfirm pacman-contrib
+}
+
+build_archlinux_pkg() {
+    rm -rf "${BUILDDIR}"
+    mkdir -p "${BUILDDIR}"
+    export_srcarchive "${BUILDDIR}/${PKGNAME}.tar.gz"
+    cp "${PROJDIR}/pkg/archlinux/PKGBUILD" "${BUILDDIR}"
+    cd "${BUILDDIR}"
+    updpkgsums
+    makepkg -s
+}
+
+add_pkguser() {
+    useradd -m ${PKGUSER}
+    chown -R ${PKGUSER} "${PROJDIR}"
+}
+
+export_srcarchive() {
+    if [ "${1}" ]; then
+        (cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${1}" HEAD)
+    fi
+}
+
+if [ "${1}" ]; then
+    ${1}
+fi

scripts/prepare

+#!/bin/bash
+
+PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
+
+if [ ! -d "${PROJDIR}/lib/qtil" ]; then
+    git clone https://github.com/akiraohgaki/qtil.git -b release-0.4.0 --single-branch --depth=1 "${PROJDIR}/lib/qtil"
+fi

scripts/scripts.pri

 DISTFILES += \
-    $${PWD}/build-docker.sh \
-    $${PWD}/build.sh \
-    $${PWD}/import.sh
+    $${PWD}/package \
+    $${PWD}/prepare