Skip to content

Commit f4e21c3

Browse files
t3chguyt3chguy
committed
Remove electron_app as we now have riot-desktop repo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
1 parent add2458 commit f4e21c3

35 files changed

Lines changed: 21 additions & 3314 deletions

‎.dockerignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ test/
33
webapp/
44
lib/
55
node_modules/
6-
electron_app/
76
karma-reports/
87
.idea/
98
.tmp/

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
/key.pem
55
/lib
66
/node_modules
7-
/electron_app/node_modules
8-
/electron_app/dist
9-
/electron_app/pub
107
/packages/
118
/webapp
129
/.npmrc

‎README.md‎

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -108,40 +108,7 @@ Riot can also be run as a desktop app, wrapped in Electron. You can download a
108108
pre-built version from https://riot.im/download/desktop/ or, if you prefer,
109109
build it yourself.
110110

111-
To build it yourself, follow the instructions below.
112-
113-
1. Follow the instructions in 'Building From Source' above, but run
114-
`yarn build` instead of `yarn dist` (since we don't need the tarball).
115-
2. Install Electron and run it:
116-
117-
```bash
118-
yarn electron
119-
```
120-
121-
To build packages, use `electron-builder`. This is configured to output:
122-
* `dmg` + `zip` for macOS
123-
* `exe` + `nupkg` for Windows
124-
* `deb` for Linux
125-
But this can be customised by editing the `build` section of package.json
126-
as per https://github.com/electron-userland/electron-builder/wiki/Options
127-
128-
See https://github.com/electron-userland/electron-builder/wiki/Multi-Platform-Build
129-
for dependencies required for building packages for various platforms.
130-
131-
The only platform that can build packages for all three platforms is macOS:
132-
```bash
133-
brew install mono
134-
yarn install
135-
yarn build:electron
136-
```
137-
138-
For other packages, use `electron-builder` manually. For example, to build a
139-
package for 64 bit Linux:
140-
141-
1. Follow the instructions in 'Building From Source' above
142-
2. `node_modules/.bin/build -l --x64`
143-
144-
All Electron packages go into `electron_app/dist/`
111+
To build it yourself, follow the instructions at https://github.com/vector-im/riot-desktop.
145112

146113
Many thanks to @aviraldg for the initial work on the Electron integration.
147114

@@ -310,7 +277,7 @@ modifying it. See the [configuration docs](docs/config.md) for details.
310277

311278
Open http://127.0.0.1:8080/ in your browser to see your newly built Riot.
312279

313-
**Note**: The build script uses inotify by default on Linux to monitor directories
280+
**Note**: The build script uses inotify by default on Linux to monitor directories
314281
for changes. If the inotify watch limit is too low your build will silently fail.
315282
To avoid this issue, we recommend a limit of at least 128M.
316283

‎docs/config.md‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -136,24 +136,11 @@ If none of these sources have an identity server set, then Riot will prompt the
136136
user to set an identity server first when attempting to use features that
137137
require one.
138138

139-
Currently the only two public identity servers are https://vector.im and
139+
Currently, the only two public identity servers are https://vector.im and
140140
https://matrix.org, however in the future identity servers will be
141141
decentralised.
142142

143143
Desktop app configuration
144144
=========================
145145

146-
To run multiple instances of the desktop app for different accounts, you can
147-
launch the executable with the `--profile` argument followed by a unique
148-
identifier, e.g `riot-web --profile Work` for it to run a separate profile and
149-
not interfere with the default one.
150-
151-
Alternatively, a custom location for the profile data can be specified using the
152-
`--profile-dir` flag followed by the desired path.
153-
154-
+ `%APPDATA%\$NAME\config.json` on Windows
155-
+ `$XDG_CONFIG_HOME\$NAME\config.json` or `~/.config/$NAME/config.json` on Linux
156-
+ `~Library/Application Support/$NAME/config.json` on macOS
157-
158-
In the paths above, `$NAME` is typically `Riot`, unless you use `--profile
159-
$PROFILE` in which case it becomes `Riot-$PROFILE`.
146+
See https://github.com/vector-im/riot-desktop#user-specified-configjson

‎electron_app/build/entitlements.mac.plist‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎electron_app/build/icon.icns‎

-170 KB
Binary file not shown.

‎electron_app/build/icon.ico‎

-35.9 KB
Binary file not shown.

‎electron_app/build/icons/128x128.png‎

-2.72 KB
Binary file not shown.

‎electron_app/build/icons/16x16.png‎

-581 Bytes
Binary file not shown.

‎electron_app/build/icons/24x24.png‎

-824 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)