Skip to content

Commit 8552fad

Browse files
committed
Add build for Apple Silicon, Bump dependencies
1 parent ead427e commit 8552fad

11 files changed

+4952
-3147
lines changed

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
node_modules/
22
release-builds/
33
tmp/
4-
.vscode/
4+
.vscode/
5+
out/
6+
.DS_Store

Makefile

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
all: build-mac-arm build-mac-x64 build-win-x64 build-win-arm64 build-linux-x64 build-linux-arm64
2+
3+
build-mac-arm:
4+
yarn electron-forge make --arch arm64 --platform darwin
5+
6+
build-mac-x64:
7+
yarn electron-forge make --arch x64 --platform darwin
8+
9+
build-win-x64:
10+
yarn electron-forge make --arch x64 --platform win32
11+
12+
build-win-arm64:
13+
yarn electron-forge make --arch arm64 --platform win32
14+
15+
build-linux-x64:
16+
yarn electron-forge make --arch x64 --platform linux
17+
18+
build-linux-arm64:
19+
yarn electron-forge make --arch arm64 --platform linux

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ It is also possible to export and import the form configuration for future chang
1010

1111
Now supports network topology preview (requires a modern browser or the Electrum release).
1212

13-
* [Demo](http://www.kathara.org/tools/nlg/) **(may not always be up to date)**
13+
* [Demo](https://www.kathara.org/tools/nlg/) **(may not always be up to date)**
1414
* [Example configuration](https://raw.githubusercontent.com/Kidel/Netkit-Lab-Generator/master/examples/example_lab.config) (can be imported to generate the files or the graph)
1515
* [Screenshot (form)](https://raw.githubusercontent.com/Kidel/Netkit-Lab-Generator/master/images/screencapture-201801261.png)
1616
* [Screenshot (graph)](https://raw.githubusercontent.com/Kidel/Netkit-Lab-Generator/master/images/screencapture-201801143.png)
@@ -22,7 +22,7 @@ Now supports network topology preview (requires a modern browser or the Electrum
2222

2323
### Links
2424

25-
* [**Kathará Home**](http://www.kathara.org)
25+
* [**Kathará Home**](https://www.kathara.org)
2626
* [**Netkit Home**](http://wiki.netkit.org/index.php/Main_Page)
2727
* [**Netkit on GitHub**](https://github.com/maxonthegit/netkit-core)
2828

electronClient.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ function startMainWindow(){
1515
width: 1280,
1616
height: 760,
1717
minWidth: 800,
18-
minHeight: 600
18+
minHeight: 600,
19+
icon: '/src/static/images/icons/icon.png'
1920
});
2021

2122
mainWindow.loadURL(url.format({

forge.config.js

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module.exports = {
2+
packagerConfig: {
3+
icon: './src/static/images/icons/icon'
4+
},
5+
rebuildConfig: {},
6+
makers: [
7+
{
8+
name: '@electron-forge/maker-zip',
9+
platforms: ['darwin', 'linux', 'win32'],
10+
},
11+
],
12+
};

0 commit comments

Comments
 (0)