Commit 3b4a498a authored by akiraohgaki's avatar akiraohgaki Committed by GitHub
Browse files

Merge pull request #48 from ocs-url/develop

Develop
parents f4e15d01 32a492b3
SOURCES += $$system(find ../app -type f -name "*.cpp" -or -name "*.qml" -or -name "*.js")
SOURCES += $$system(find $${PWD}/../app -type f -name "*.cpp" -or -name "*.qml" -or -name "*.js")
TRANSLATIONS += \
messages.ts \
messages.en_US.ts \
messages.ja_JP.ts \
messages.tr_TR.ts
$${PWD}/messages.ts \
$${PWD}/messages.en_US.ts \
$${PWD}/messages.ja_JP.ts \
$${PWD}/messages.tr_TR.ts
include(i18n.pri)
include($${PWD}/i18n.pri)
......@@ -6,13 +6,12 @@ CONFIG += c++11
DEFINES += QT_DEPRECATED_WARNINGS
DISTFILES += README.md
DISTFILES += $${PWD}/README.md
include(lib/lib.pri)
include(app/app.pri)
include(desktop/desktop.pri)
include(i18n/i18n.pri)
include(pkg/pkg.pri)
include(scripts/scripts.pri)
include(deployment.pri)
include($${PWD}/lib/lib.pri)
include($${PWD}/app/app.pri)
include($${PWD}/desktop/desktop.pri)
include($${PWD}/i18n/i18n.pri)
include($${PWD}/pkg/pkg.pri)
include($${PWD}/scripts/scripts.pri)
include($${PWD}/deployment.pri)
......@@ -10,7 +10,7 @@ URL: https://github.com/ocs-url/ocs-url
Source0: %{name}.tar.gz
Requires: qt5-qtbase >= 5.2.0, qt5-qtbase-gui >= 5.2.0, qt5-qtsvg >= 5.2.0, qt5-qtdeclarative >= 5.2.0, qt5-qtquickcontrols >= 5.2.0
BuildRequires: git make, automake, gcc, gcc-c++, libtool, qt5-qtbase-devel >= 5.2.0, qt5-qtsvg-devel >= 5.2.0, qt5-qtdeclarative-devel >= 5.2.0, rpm-build
BuildRequires: git, make, automake, gcc, gcc-c++, libtool, qt5-qtbase-devel >= 5.2.0, qt5-qtsvg-devel >= 5.2.0, qt5-qtdeclarative-devel >= 5.2.0, rpm-build
%description
An install helper program for items served on OpenCollaborationServices (OCS).
......@@ -38,7 +38,7 @@ make INSTALL_ROOT="%{buildroot}" install
rm -rf %{buildroot}
%changelog
* Thu Mar 02 2017 Akira Ohgaki <akiraohgaki@gmail.com> - 3.0.0-1
* Sun Mar 05 2017 Akira Ohgaki <akiraohgaki@gmail.com> - 3.0.0-1
- Rename xdgurl to ocs-url
- Add ocs:// and ocss:// schemes
- xdg:// and xdgs:// schemes still available for backward compatibile
......
......@@ -12,7 +12,7 @@ ocs-url (3.0.0-0ubuntu1) trusty; urgency=low
* Add ja_JP translation
* Add tr_TR translation (by tarakbumba)
-- Akira Ohgaki <akiraohgaki@gmail.com> Thu, 02 Mar 2017 18:39:39 +0000
-- Akira Ohgaki <akiraohgaki@gmail.com> Sun, 05 Mar 2017 16:53:43 +0000
ocs-url (2.0.3-0ubuntu1) trusty; urgency=low
......
......@@ -11,11 +11,6 @@ if [ "${1}" ]; then
BUILDTYPE="${1}"
fi
TREEISH='HEAD'
if [ "${2}" ]; then
TREEISH="${2}"
fi
PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
BUILDVER="$(cd "${PROJDIR}" && git describe --always)"
......@@ -29,13 +24,14 @@ SRCARCHIVE="${BUILDDIR}/${PKGNAME}.tar.gz"
################################################################################
export_srcarchive() {
filepath="${1}"
$(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${filepath}" "${TREEISH}")
$(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${filepath}" HEAD)
}
transfer_file() {
filepath="${1}"
if [ -f "${filepath}" ]; then
filename="$(basename "${filepath}")"
echo "Uploading ${filename}"
curl -T "${filepath}" "https://transfer.sh/${filename}"
fi
}
......@@ -134,6 +130,7 @@ pre_appimage() {
build_appimage() {
tar -xzvf "${SRCARCHIVE}" -C "${BUILDDIR}"
cd "${BUILDDIR}/${PKGNAME}"
sh scripts/import.sh
qmake
make
strip "${PKGNAME}"
......@@ -177,6 +174,6 @@ elif [ "${BUILDTYPE}" = 'snap' ]; then
elif [ "${BUILDTYPE}" = 'appimage' ]; then
pre_appimage && build_appimage && post_appimage
else
echo "sh $(basename "${0}") [ubuntu|fedora|archlinux|snap|appimage] [tree_ish]"
echo "sh $(basename "${0}") [ubuntu|fedora|archlinux|snap|appimage]"
exit 1
fi
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment