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

Merge pull request #25 from vector-im/dbkr/split_32_64_bit_builds

Browse Source 
Split 32/64 bit building
This commit is contained in:
David Baker 2020-02-20 17:47:02 +00:00 committed by GitHub
commit 52f973b5b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 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
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):
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).
@ -66,6 +77,9 @@ to be installed, depending on your OS (eg. rust, tcl, make/nmake).
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:
```
# Run this once to make the docker image

12
package.json
View File

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