Browse Source

Nettoyage/amélioration scripts de build + bump version electron

upgrade-electron
William Petit 3 years ago
parent
commit
5de75e42f8
3 changed files with 6 additions and 8 deletions
  1. 1
    3
      Makefile
  2. 2
    2
      README.md
  3. 3
    3
      package.json

+ 1
- 3
Makefile View File

@@ -14,9 +14,7 @@ build:
14 14
 	curl --silent --location https://deb.nodesource.com/setup_0.12 | bash -
15 15
 	apt-get install --yes nodejs
16 16
 	npm install --ignore-scripts
17
-	npm run clean
18
-	npm run compile
19
-	npm run package -- --arch=$(ELECTRON_ARCH)
17
+	ARCH=$(ELECTRON_ARCH) npm run build
20 18
 
21 19
 install:
22 20
 	mkdir -p $(INSTALL_LOCATION)

+ 2
- 2
README.md View File

@@ -36,8 +36,8 @@ Vous pouvez configurer le comportement de Pitaya en passant des variables d'envi
36 36
 
37 37
 ## Comment construire l'application depuis les sources
38 38
 
39
-```
40
-npm run build
39
+```bash
40
+ARCH=<ARCH> npm run build # Où ARCH peut être "x64", "ia32" ou "all"
41 41
 ```
42 42
 
43 43
 Un dossier `pitaya-<target>-<arch>` sera créé dans le répertoire `./build`. Celui ci contient tous les fichiers nécessaires à l'application.

+ 3
- 3
package.json View File

@@ -5,7 +5,7 @@
5 5
   "main": "main.js",
6 6
   "devDependencies": {
7 7
     "electron-packager": "^5.1.0",
8
-    "electron-prebuilt": "^0.33.6",
8
+    "electron-prebuilt": "^0.37.5",
9 9
     "nodeunit": "^0.9.1",
10 10
     "react-tools": "^0.13.3",
11 11
     "node-jsx": "^0.13.3"
@@ -15,8 +15,8 @@
15 15
     "start": "./node_modules/.bin/electron .",
16 16
     "compile": "./node_modules/.bin/jsx -x js --no-cache-dir src dist",
17 17
     "clean": "rm -rf dist/* build/*",
18
-    "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",
19
-    "build": "npm run clean && npm run compile && npm run package"
18
+    "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",
19
+    "build": "npm run clean && npm run compile && npm run package -- --arch=$ARCH"
20 20
   },
21 21
   "dependencies": {
22 22
     "bootstrap": "^3.3.5",

Loading…
Cancel
Save