From 4df989270eb4084cce81164e57b11a55a80d0b57 Mon Sep 17 00:00:00 2001 From: William Petit Date: Tue, 20 Oct 2015 17:17:42 +0200 Subject: [PATCH] Fichiers obligatoires package Debian --- Makefile | 7 ++++--- debian/control | 9 +++++++-- debian/pitaya.install | 1 - debian/pitaya_amd64.install | 1 + debian/pitaya_ia32.install | 1 + package.json | 2 +- scripts/install-build-deps.sh | 5 +++++ 7 files changed, 19 insertions(+), 7 deletions(-) delete mode 100644 debian/pitaya.install create mode 100644 debian/pitaya_amd64.install create mode 100644 debian/pitaya_ia32.install create mode 100755 scripts/install-build-deps.sh diff --git a/Makefile b/Makefile index c87308e..d75374d 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,9 @@ build: clean npm run build -clean: +clean: install-deps npm run clean -install: build - env +install-deps: + ./scripts/install-build-deps.sh + npm install diff --git a/debian/control b/debian/control index 9fe93ad..ea1b7d4 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,12 @@ Homepage: Vcs-Git: https://forge.cadoles.com/wpetit/pitaya.git Vcs-Browser: https://forge.cadoles.com/wpetit/pitaya -Package: pitaya -Architecture: any +Package: pitaya_amd64 +Architecture: amd64 +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Lanceur d'application pour GNU/Linux + +Package: pitaya_ia32 +Architecture: ia32 Depends: ${shlibs:Depends}, ${misc:Depends} Description: Lanceur d'application pour GNU/Linux diff --git a/debian/pitaya.install b/debian/pitaya.install deleted file mode 100644 index 8b1f10a..0000000 --- a/debian/pitaya.install +++ /dev/null @@ -1 +0,0 @@ -build/pitaya-linux-x64 opt/pitaya diff --git a/debian/pitaya_amd64.install b/debian/pitaya_amd64.install new file mode 100644 index 0000000..b920387 --- /dev/null +++ b/debian/pitaya_amd64.install @@ -0,0 +1 @@ +build/pitaya-linux-x64/* opt/pitaya diff --git a/debian/pitaya_ia32.install b/debian/pitaya_ia32.install new file mode 100644 index 0000000..346f6d1 --- /dev/null +++ b/debian/pitaya_ia32.install @@ -0,0 +1 @@ +build/pitaya-linux-ia32/* opt/pitaya diff --git a/package.json b/package.json index 99c47d7..b0cd4fd 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "start": "./node_modules/.bin/electron .", "compile": "./node_modules/.bin/jsx -x js src dist", "clean": "rm -rf dist/* build/*", - "package": "./node_modules/.bin/electron-packager ./ pitaya --prune --ignore=res/ --platform=linux --arch=ia32,x64 --version=0.33.6 --out=build --overwrite --app-version 0.0.0", + "package": "./node_modules/.bin/electron-packager ./ pitaya --prune --ignore=res/ --ignore=scripts/ --ignore=debian/ --ignore=test/ --platform=linux --arch=ia32,x64 --version=0.33.6 --out=build --overwrite --app-version 0.0.0", "build": "npm run clean && npm run compile && npm run package" }, "dependencies": { diff --git a/scripts/install-build-deps.sh b/scripts/install-build-deps.sh new file mode 100755 index 0000000..31859da --- /dev/null +++ b/scripts/install-build-deps.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +apt-get install --yes --no-install-recommends curl ca-certificates || exit 1 +curl --silent --location https://deb.nodesource.com/setup_4.x | bash - || exit 1 +apt-get install --yes nodejs || exit 1