Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Split 32/64 bit building #25

Merged
merged 2 commits into from
Feb 20, 2020
Merged

Split 32/64 bit building #25

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8843116
Split 32/64 bit building
dbkr Feb 19, 2020
53b7966
Be more consistent (and match README)
dbkr Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,27 @@ 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).
```
yarn run build:native
dbkr marked this conversation as resolved.
Show resolved Hide resolved
```

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
Expand Down
10 changes: 4 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
"setversion": "node scripts/set-version.js",
"start": "electron .",
"lint": "eslint src/ scripts/ hak/",
"build": "yarn run setversion && electron-builder",
"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:buildnative": "scripts/in-docker.sh yarn run hak",
"docker:build": "scripts/in-docker.sh yarn run build",
Expand Down Expand Up @@ -92,11 +94,7 @@
},
"win": {
"target": {
"target": "squirrel",
"arch": [
"x64",
"ia32"
]
"target": "squirrel"
},
"certificateSubjectName": "New Vector Ltd"
},
Expand Down