Commit ea079a9c authored by akiraohgaki's avatar akiraohgaki

Merge branch 'develop'

parents 13141468 ce7af205
Pipeline #55 passed with stage
in 4 minutes and 2 seconds
......@@ -3,8 +3,6 @@ SHELL = /bin/sh
TARGET = ocs-store
srcdir = .
build_tmpdir = ./build_tmp
DESTDIR =
prefix = /usr/local
exec_prefix = $(prefix)
......@@ -28,9 +26,7 @@ rebuild: clean build ;
build: $(TARGET) ;
clean:
$(RM) $(build_tmpdir)
$(RM) $(srcdir)/node_modules
$(RM) $(srcdir)/bin
$(RM) $(srcdir)/dist
install:
......@@ -48,14 +44,7 @@ uninstall:
$(TARGET): $(TARGET)-linux-x64 ;
$(TARGET)-linux-x64: ocs-manager
$(TARGET)-linux-x64:
cd $(srcdir) ; \
npm install ; \
npm run package
ocs-manager:
$(MKDIR) $(build_tmpdir)
git clone https://gitlab.opencode.net/OCS/ocs-manager.git -b release-0.6.5 --single-branch --depth=1 $(build_tmpdir)/ocs-manager
cd $(build_tmpdir)/ocs-manager ; \
./scripts/package build_appimage
$(INSTALL_PROGRAM) `find "$(build_tmpdir)/ocs-manager" -type f -name "ocs-manager*-x86_64.AppImage"` $(srcdir)/bin/ocs-manager
This diff is collapsed.
......@@ -16,15 +16,15 @@
"scripts": {
"start": "electron .",
"debug": "electron . --debug",
"package": "electron-packager . ocs-store --platform=linux --arch=x64 --out=dist --overwrite --ignore='^/(\\.gitignore|\\.gitlab\\-ci\\.yml|\\.travis\\.yml|Makefile|README\\.md|desktop|launcher|pkg|scripts|appimagebuild|appimagetool|squashfs\\-root|build_.+)($|/)'"
"package": "electron-packager . ocs-store --platform=linux --arch=x64 --out=dist --overwrite --ignore='^/(\\.gitignore|\\.gitlab\\-ci\\.yml|Makefile|README\\.md|desktop|launcher|pkg|scripts|appimagebuild|appimagetool|squashfs\\-root)($|/)'"
},
"dependencies": {
"electron-store": "2.0.0",
"import-export": "1.0.1",
"request": "2.87.0"
"request": "2.88.0"
},
"devDependencies": {
"electron": "2.0.4",
"electron-packager": "12.1.0"
"electron": "2.0.8",
"electron-packager": "12.1.1"
}
}
......@@ -10,6 +10,7 @@ curl -fsSL -o appimagetool https://github.com/AppImage/AppImageKit/releases/down
chmod 755 appimagetool
./appimagetool --appimage-extract
./scripts/prepare
make
make DESTDIR="${PKGNAME}.AppDir" prefix=/usr install
......
......@@ -11,31 +11,18 @@ PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
BUILDDIR="${PROJDIR}/build_${PKGNAME}"
appimage() { # docker-image: ubuntu:14.04
apt update -qq
apt -y install curl git
#apt -y install build-essential qt5-default libqt5websockets5-dev
#apt -y install cmake libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libxpm-dev
apt -y install libfontconfig1 libfreetype6 libssl1.0.0 zlib1g unzip p7zip unar
install_build_deps_appimage
add_pkguser
su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_appimage" ${PKGUSER}
transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*-x86_64.AppImage")"
}
apt -y install software-properties-common
add-apt-repository -y ppa:beineri/opt-qt596-trusty
echo 'deb http://download.opensuse.org/repositories/home:/TheAssassin:/AppImageLibraries/xUbuntu_14.04/ /' > /etc/apt/sources.list.d/curl-httponly.list
curl -fsSL https://download.opensuse.org/repositories/home:TheAssassin:AppImageLibraries/xUbuntu_14.04/Release.key | apt-key add -
install_build_deps_appimage() {
apt update -qq
apt -y install build-essential mesa-common-dev libglu1-mesa-dev qt59base qt59websockets
curl -fsSL https://cmake.org/files/v3.12/cmake-3.12.1-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C /
apt -y install libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libxpm-dev
apt -y install curl git
apt -y install build-essential
$(git clone https://github.com/tj/n.git -b master --single-branch --depth=1 "${PROJDIR}/n" && cd "${PROJDIR}/n" && make install && rm -rf "${PROJDIR}/n" && n lts)
apt -y install libgconf-2-4 libxss1 libcanberra-gtk-module libgnome-keyring0
useradd -m ${PKGUSER}
chown -R ${PKGUSER} "${PROJDIR}"
su -c "export HOME=/home/${PKGUSER} && source /opt/qt59/bin/qt59-env.sh && "${PKGSCRIPT}" build_appimage" ${PKGUSER}
transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*-x86_64.AppImage")"
}
build_appimage() {
......@@ -48,6 +35,11 @@ build_appimage() {
./appimagebuild
}
add_pkguser() {
useradd -m ${PKGUSER}
chown -R ${PKGUSER} "${PROJDIR}"
}
export_srcarchive() {
if [ "${1}" ]; then
$(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${1}" HEAD)
......
#!/bin/bash
PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
if [ ! -f "${PROJDIR}/bin/ocs-manager" ]; then
mkdir -p "${PROJDIR}/bin"
curl -fsSL -o "${PROJDIR}/bin/ocs-manager" https://gitlab.opencode.net/OCS/ocs-manager/uploads/1156210f020d534fafc330d4e4243501/ocs-manager-0.7.0-1-x86_64.AppImage
chmod 755 "${PROJDIR}/bin/ocs-manager"
fi
Markdown is supported
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