From 8049d1c1eec513ddbd9ba8fefaade8b04a16368a Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Wed, 31 Jan 2018 22:49:33 +0900
Subject: [PATCH] Remove snap and appimage packaging resources
---
pkg/appimage/appimage.sh | 19 --------------
pkg/pkg.pri | 5 +---
pkg/snap/snap/gui/ocs-url.desktop | 9 -------
pkg/snap/snapcraft.yaml | 42 -------------------------------
scripts/build-docker.sh | 28 ++-------------------
scripts/build.sh | 19 ++------------
6 files changed, 5 insertions(+), 117 deletions(-)
delete mode 100644 pkg/appimage/appimage.sh
delete mode 100644 pkg/snap/snap/gui/ocs-url.desktop
delete mode 100644 pkg/snap/snapcraft.yaml
diff --git a/pkg/appimage/appimage.sh b/pkg/appimage/appimage.sh
deleted file mode 100644
index 075a265..0000000
--- a/pkg/appimage/appimage.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-PKGNAME='ocs-url'
-PKGVER='0.0.0'
-PKGREL='1'
-
-curl -L -o linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-chmod 755 linuxdeployqt
-./linuxdeployqt --appimage-extract
-
-sh scripts/import.sh
-qmake PREFIX="/usr"
-make
-make INSTALL_ROOT="${PKGNAME}.AppDir" install
-
-./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -bundle-non-qt-libs -no-translations -qmldir="app/qml"
-./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -appimage
-
-mv *.AppImage ${PKGNAME}-${PKGVER}-${PKGREL}-x86_64.AppImage
diff --git a/pkg/pkg.pri b/pkg/pkg.pri
index c1f00fd..4f03e98 100644
--- a/pkg/pkg.pri
+++ b/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
diff --git a/pkg/snap/snap/gui/ocs-url.desktop b/pkg/snap/snap/gui/ocs-url.desktop
deleted file mode 100644
index f0b1b9c..0000000
--- a/pkg/snap/snap/gui/ocs-url.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[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;
diff --git a/pkg/snap/snapcraft.yaml b/pkg/snap/snapcraft.yaml
deleted file mode 100644
index 149514f..0000000
--- a/pkg/snap/snapcraft.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-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
diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
index a1ab5e0..8a6f7c1 100644
--- a/scripts/build-docker.sh
+++ b/scripts/build-docker.sh
@@ -93,19 +93,7 @@ build_archlinux() {
}
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")"
+ echo 'Not implemented yet'
}
build_flatpak() {
@@ -113,19 +101,7 @@ build_flatpak() {
}
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 qtdeclarative5-dev-tools
- 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")"
+ echo 'Not implemented yet'
}
if [ "${BUILDTYPE}" = 'ubuntu' ]; then
diff --git a/scripts/build.sh b/scripts/build.sh
index 2e6328e..b51ce13 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -67,15 +67,7 @@ build_archlinux() {
}
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
+ echo 'Not implemented yet'
}
build_flatpak() {
@@ -83,14 +75,7 @@ build_flatpak() {
}
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
+ echo 'Not implemented yet'
}
if [ "${BUILDTYPE}" = 'ubuntu' ]; then
--
GitLab