From 5de75e42f860d32f5ebed51761c9ee567a9b3c30 Mon Sep 17 00:00:00 2001 From: William Petit Date: Fri, 15 Apr 2016 17:02:22 +0200 Subject: [PATCH] =?UTF-8?q?Nettoyage/am=C3=A9lioration=20scripts=20de=20bu?= =?UTF-8?q?ild=20+=20bump=20version=20electron?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 +--- README.md | 4 ++-- package.json | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index bdf68c4..391a612 100644 --- a/Makefile +++ b/Makefile @@ -14,9 +14,7 @@ build: 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) + ARCH=$(ELECTRON_ARCH) npm run build install: mkdir -p $(INSTALL_LOCATION) diff --git a/README.md b/README.md index b142e12..010c5a6 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ Vous pouvez configurer le comportement de Pitaya en passant des variables d'envi ## Comment construire l'application depuis les sources -``` -npm run build +```bash +ARCH= npm run build # Où ARCH peut être "x64", "ia32" ou "all" ``` Un dossier `pitaya--` sera créé dans le répertoire `./build`. Celui ci contient tous les fichiers nécessaires à l'application. diff --git a/package.json b/package.json index a58aae1..5ddb801 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "main.js", "devDependencies": { "electron-packager": "^5.1.0", - "electron-prebuilt": "^0.33.6", + "electron-prebuilt": "^0.37.5", "nodeunit": "^0.9.1", "react-tools": "^0.13.3", "node-jsx": "^0.13.3" @@ -15,8 +15,8 @@ "start": "./node_modules/.bin/electron .", "compile": "./node_modules/.bin/jsx -x js --no-cache-dir src dist", "clean": "rm -rf dist/* build/*", - "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" + "package": "./node_modules/.bin/electron-packager ./ pitaya --out=./build --app-version 0.0.0 --version=0.37.5 --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 -- --arch=$ARCH" }, "dependencies": { "bootstrap": "^3.3.5",