From 614523d470a1e6654ce660ed5eab1890da5abbe5 Mon Sep 17 00:00:00 2001 From: William Petit Date: Sat, 17 Oct 2015 11:34:37 +0200 Subject: [PATCH 1/4] Base debian package --- Makefile | 10 ++++++++++ debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 14 ++++++++++++++ debian/pitaya.install | 1 + debian/rules | 8 ++++++++ debian/source/format | 1 + 7 files changed, 40 insertions(+) create mode 100644 Makefile create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/pitaya.install create mode 100644 debian/rules create mode 100644 debian/source/format diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c87308e --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ + + +build: clean + npm run build + +clean: + npm run clean + +install: build + env diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..ceeb097 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +pitaya (0.0.0) unstable; urgency=low + + * Initial release (Closes: #nnnn) + + -- William Petit Fri, 16 Oct 2015 15:57:03 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..9fe93ad --- /dev/null +++ b/debian/control @@ -0,0 +1,14 @@ +Source: pitaya +Section: unknown +Priority: optional +Maintainer: William Petit +Build-Depends: debhelper (>= 8.0.0) +Standards-Version: 3.9.4 +Homepage: +Vcs-Git: https://forge.cadoles.com/wpetit/pitaya.git +Vcs-Browser: https://forge.cadoles.com/wpetit/pitaya + +Package: pitaya +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Lanceur d'application pour GNU/Linux diff --git a/debian/pitaya.install b/debian/pitaya.install new file mode 100644 index 0000000..8b1f10a --- /dev/null +++ b/debian/pitaya.install @@ -0,0 +1 @@ +build/pitaya-linux-x64 opt/pitaya diff --git a/debian/rules b/debian/rules new file mode 100644 index 0000000..218df65 --- /dev/null +++ b/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) From c1fe1884e2540453d37f403933f8a0be1ceebcbd Mon Sep 17 00:00:00 2001 From: William Petit Date: Mon, 19 Oct 2015 13:24:05 +0200 Subject: [PATCH 2/4] Ajout debounce chargement icone --- src/components/common/app-icon.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/common/app-icon.js b/src/components/common/app-icon.js index 2476ae9..0e8b6d9 100644 --- a/src/components/common/app-icon.js +++ b/src/components/common/app-icon.js @@ -2,6 +2,7 @@ var React = require('react'); var Util = require('../../util'); var LazyLoad = require('../mixins/lazy-load'); var debug = Util.Debug('common:app-icon'); +var _ = require('lodash'); var LOADING_ICON = 'img/hourglass.svg'; var DEFAULT_ICON = 'img/default-icon.svg'; @@ -10,6 +11,12 @@ module.exports = React.createClass({ mixins: [LazyLoad], + componentWillMount: function() { + if(!this._findIconDebounced) { + this._findIconDebounced = _.debounce(this._findIcon, 250); + } + }, + getInitialState: function() { return { icon: DEFAULT_ICON, iconPath: DEFAULT_ICON, currentTheme: '' }; }, @@ -33,7 +40,7 @@ module.exports = React.createClass({ this.setState({ icon: newIcon, iconPath: LOADING_ICON, currentTheme: newTheme }); - this._findIcon(newIcon, newTheme); + this._findIconDebounced(newIcon, newTheme); }, From 4df989270eb4084cce81164e57b11a55a80d0b57 Mon Sep 17 00:00:00 2001 From: William Petit Date: Tue, 20 Oct 2015 17:17:42 +0200 Subject: [PATCH 3/4] 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 From 331db1e03574b678b1b7e8883d16ab1614983ef9 Mon Sep 17 00:00:00 2001 From: William Petit Date: Thu, 22 Oct 2015 13:49:38 +0200 Subject: [PATCH 4/4] Packaging Debian fonctionnel --- Makefile | 23 +++++++++++++++++------ debian/control | 10 ++-------- debian/pitaya_amd64.install | 1 - debian/pitaya_ia32.install | 1 - debian/rules | 11 ++++++++++- package.json | 4 ++-- scripts/install-build-deps.sh | 5 ----- 7 files changed, 31 insertions(+), 24 deletions(-) delete mode 100644 debian/pitaya_amd64.install delete mode 100644 debian/pitaya_ia32.install delete mode 100755 scripts/install-build-deps.sh diff --git a/Makefile b/Makefile index d75374d..e15f1a2 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,22 @@ +DESTDIR=./ +INSTALL_LOCATION=$(DESTDIR)/opt/pitaya +ELECTRON_ARCH=x64 +ifeq ($(DEB_TARGET_ARCH), i386) + ELECTRON_ARCH=ia32 +endif -build: clean - npm run build +all: build -clean: install-deps +build: + apt-get install --yes --no-install-recommends curl ca-certificates + curl --silent --location https://deb.nodesource.com/setup_0.12 | bash - + apt-get install --yes nodejs + npm install --ignore-scripts npm run clean + npm run compile + npm run package -- --arch=$(ELECTRON_ARCH) -install-deps: - ./scripts/install-build-deps.sh - npm install +install: + mkdir -p $(INSTALL_LOCATION) + cp -r build/pitaya-linux-$(ELECTRON_ARCH)/* $(INSTALL_LOCATION)/ diff --git a/debian/control b/debian/control index ea1b7d4..b53efd9 100644 --- a/debian/control +++ b/debian/control @@ -8,12 +8,6 @@ Homepage: Vcs-Git: https://forge.cadoles.com/wpetit/pitaya.git Vcs-Browser: https://forge.cadoles.com/wpetit/pitaya -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} +Package: pitaya +Architecture: any Description: Lanceur d'application pour GNU/Linux diff --git a/debian/pitaya_amd64.install b/debian/pitaya_amd64.install deleted file mode 100644 index b920387..0000000 --- a/debian/pitaya_amd64.install +++ /dev/null @@ -1 +0,0 @@ -build/pitaya-linux-x64/* opt/pitaya diff --git a/debian/pitaya_ia32.install b/debian/pitaya_ia32.install deleted file mode 100644 index 346f6d1..0000000 --- a/debian/pitaya_ia32.install +++ /dev/null @@ -1 +0,0 @@ -build/pitaya-linux-ia32/* opt/pitaya diff --git a/debian/rules b/debian/rules index 218df65..4ec8f96 100644 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,16 @@ # -*- makefile -*- # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 %: dh $@ + +override_dh_makeshlibs: + # Disabled + +override_dh_shlibdeps: + # Disabled + +override_dh_strip: + # Disabled diff --git a/package.json b/package.json index b0cd4fd..b0cb5f2 100644 --- a/package.json +++ b/package.json @@ -13,9 +13,9 @@ "scripts": { "test": "./node_modules/.bin/nodeunit test", "start": "./node_modules/.bin/electron .", - "compile": "./node_modules/.bin/jsx -x js src dist", + "compile": "./node_modules/.bin/jsx -x js --no-cache-dir src dist", "clean": "rm -rf dist/* build/*", - "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", + "package": "./node_modules/.bin/electron-packager ./ pitaya --out=./build --app-version 0.0.0 --version=0.33.6 --prune --ignore='/res(/|$)' --ignore='/debian(/|$)' --ignore='/scripts(/|$)' --ignore='/build(/|$)' --ignore='/test(/|$)' --ignore='/electron-packager(/|$)' --ignore='/electron-tmp-.+(/|$)' --platform=linux --overwrite", "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 deleted file mode 100755 index 31859da..0000000 --- a/scripts/install-build-deps.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/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