gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix electron build

Browse Source
This commit is contained in:
azivner 2018-01-31 08:03:25 -05:00
parent 56b59e59bc
commit d1329f60c3
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/build.sh
View File

@ -7,15 +7,15 @@ rm -r dist/*
echo "Rebuilding binaries for linux-ia32" echo "Rebuilding binaries for linux-ia32"
./node_modules/.bin/electron-rebuild --arch=ia32 ./node_modules/.bin/electron-rebuild --arch=ia32
./node_modules/.bin/electron-packager src/electron --out=dist --platform=linux --arch=ia32 --overwrite ./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=ia32 --overwrite
./node_modules/.bin/electron-packager src/electron --out=dist --platform=win32 --arch=x64 --overwrite ./node_modules/.bin/electron-packager . --out=dist --platform=win32 --arch=x64 --overwrite
# we build x64 as second so that we keep X64 binaries in node_modules for local development # we build x64 as second so that we keep X64 binaries in node_modules for local development
echo "Rebuilding binaries for linux-x64" echo "Rebuilding binaries for linux-x64"
./node_modules/.bin/electron-rebuild --arch=x64 ./node_modules/.bin/electron-rebuild --arch=x64
./node_modules/.bin/electron-packager src/electron --out=dist --platform=linux --arch=x64 --overwrite ./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=x64 --overwrite
echo "Copying required windows binaries" echo "Copying required windows binaries"

4
src/electron.js → electron.js
View File

@ -2,7 +2,7 @@
const electron = require('electron'); const electron = require('electron');
const path = require('path'); const path = require('path');
const config = require('./services/config'); const config = require('./src/services/config');
const url = require("url"); const url = require("url");
const app = electron.app; const app = electron.app;
@ -69,4 +69,4 @@ app.on('ready', () => {
mainWindow = createMainWindow(); mainWindow = createMainWindow();
}); });
require('./www'); require('./src/www');

3
package.json
View File

@ -3,6 +3,7 @@
"description": "Trilium Notes", "description": "Trilium Notes",
"version": "0.5.1-beta", "version": "0.5.1-beta",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"main": "electron.js",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/zadam/trilium.git" "url": "https://github.com/zadam/trilium.git"
@ -12,7 +13,7 @@
"test-electron": "xo", "test-electron": "xo",
"rebuild-electron": "electron-rebuild", "rebuild-electron": "electron-rebuild",
"start-electron": "electron src/electron", "start-electron": "electron src/electron",
"build-electron": "electron-packager src/electron --out=dist --asar --overwrite --all", "build-electron": "electron-packager . --out=dist --asar --overwrite --all",
"start-forge": "electron-forge start", "start-forge": "electron-forge start",
"package-forge": "electron-forge package", "package-forge": "electron-forge package",
"make-forge": "electron-forge make", "make-forge": "electron-forge make",