CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-18 15:34:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split 32/64 bit building

Browse Source 
As they'll need different native deps
This commit is contained in:
David Baker 2020-02-19 14:21:33 +00:00
parent d8c8e1b133
commit 8843116357
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -59,6 +59,17 @@ This will do a couple of things:
* Run electron-builder to build a package. The package built will match the operating system * Run electron-builder to build a package. The package built will match the operating system
you're running the build process on. you're running the build process on.
If you're on Windows, you can choose to build specifically for 32 or 64 bit:
```
yarn run build32
```
or
```
yarn run build64
```
This build step will not build any native modules.
If you'd like to build the native modules (for searching in encrypted rooms): If you'd like to build the native modules (for searching in encrypted rooms):
This will take 10 minutes or so, and will require a number of native tools This will take 10 minutes or so, and will require a number of native tools
to be installed, depending on your OS (eg. rust, tcl, make/nmake). to be installed, depending on your OS (eg. rust, tcl, make/nmake).
@ -66,6 +77,9 @@ to be installed, depending on your OS (eg. rust, tcl, make/nmake).
yarn run build:native yarn run build:native
``` ```
On Windows, this will automatically determine the architecture to build for based
on the environment (ie. set up by vcvarsall.bat).
You can also build using docker, which will always produce the linux package: You can also build using docker, which will always produce the linux package:
``` ```
# Run this once to make the docker image # Run this once to make the docker image

10
package.json
View File

@ -17,8 +17,10 @@
"setversion": "node scripts/set-version.js", "setversion": "node scripts/set-version.js",
"start": "electron .", "start": "electron .",
"lint": "eslint src/ scripts/ hak/", "lint": "eslint src/ scripts/ hak/",
"build": "yarn run setversion && electron-builder",
"buildnative": "yarn run hak", "buildnative": "yarn run hak",
"build32": "yarn run setversion && electron-builder --ia32",
"build64": "yarn run setversion && electron-builder --x64",
"build": "yarn run setversion && electron-builder",
"docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild", "docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild",
"docker:buildnative": "scripts/in-docker.sh yarn run hak", "docker:buildnative": "scripts/in-docker.sh yarn run hak",
"docker:build": "scripts/in-docker.sh yarn run build", "docker:build": "scripts/in-docker.sh yarn run build",
@ -92,11 +94,7 @@
}, },
"win": { "win": {
"target": { "target": {
"target": "squirrel", "target": "squirrel"
"arch": [
"x64",
"ia32"
]
}, },
"certificateSubjectName": "New Vector Ltd" "certificateSubjectName": "New Vector Ltd"
}, },