Skip to content

Commit 4e0c645

Browse files
JermoleneJermolene
committed
Add Apple Silicon support, and update to nwjs v0.77.0
1 parent f60c399 commit 4e0c645

File tree

4 files changed

+29
-11
lines changed

4 files changed

+29
-11
lines changed

‎bld.sh‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ node propagate-version.js
2222
mkdir -p output
2323
mkdir -p output/mac64
2424
mkdir -p output/mac64/TiddlyDesktop-mac64-v$(./bin/get-version-number)
25+
mkdir -p output/macapplesilicon
26+
mkdir -p output/macapplesilicon/TiddlyDesktop-macapplesilicon-v$(./bin/get-version-number)
2527
mkdir -p output/win32
2628
mkdir -p output/win32/TiddlyDesktop-win32-v$(./bin/get-version-number)
2729
mkdir -p output/win64
@@ -35,7 +37,7 @@ mkdir -p output/linux64/TiddlyDesktop-linux64-v$(./bin/get-version-number)
3537

3638
# OS X 64-bit App
3739

38-
cp -RH nwjs/nwjs-sdk-v0.71.1-osx-x64/nwjs.app output/mac64/TiddlyDesktop-mac64-v$(./bin/get-version-number)/TiddlyDesktop.app
40+
cp -RH nwjs/nwjs-sdk-v0.77.0-osx-x64/nwjs.app output/mac64/TiddlyDesktop-mac64-v$(./bin/get-version-number)/TiddlyDesktop.app
3941
cp -RH source output/mac64/TiddlyDesktop-mac64-v$(./bin/get-version-number)/TiddlyDesktop.app/Contents/Resources/app.nw
4042
cp icons/app.icns output/mac64/TiddlyDesktop-mac64-v$(./bin/get-version-number)/TiddlyDesktop.app/Contents/Resources/nw.icns
4143
cp Info.plist output/mac64/TiddlyDesktop-mac64-v$(./bin/get-version-number)/TiddlyDesktop.app/Contents/Info.plist
@@ -45,18 +47,30 @@ do
4547
cp "./strings/InfoPlist.strings" "$f/InfoPlist.strings"
4648
done
4749

50+
# OS X Apple Silicon App
51+
52+
cp -RH nwjs/nwjs-sdk-v0.77.0-osx-arm64/nwjs.app output/macapplesilicon/TiddlyDesktop-macapplesilicon-v$(./bin/get-version-number)/TiddlyDesktop.app
53+
cp -RH source output/macapplesilicon/TiddlyDesktop-macapplesilicon-v$(./bin/get-version-number)/TiddlyDesktop.app/Contents/Resources/app.nw
54+
cp icons/app.icns output/macapplesilicon/TiddlyDesktop-macapplesilicon-v$(./bin/get-version-number)/TiddlyDesktop.app/Contents/Resources/nw.icns
55+
cp Info.plist output/macapplesilicon/TiddlyDesktop-macapplesilicon-v$(./bin/get-version-number)/TiddlyDesktop.app/Contents/Info.plist
56+
57+
for f in output/macapplesilicon/TiddlyDesktop-macapplesilicon-v$(./bin/get-version-number)/TiddlyDesktop.app/Contents/Resources/*.lproj
58+
do
59+
cp "./strings/InfoPlist.strings" "$f/InfoPlist.strings"
60+
done
61+
4862
# Windows 64-bit App
49-
cp -RH nwjs/nwjs-sdk-v0.71.1-win-x64/* output/win64/TiddlyDesktop-win64-v$(./bin/get-version-number)
63+
cp -RH nwjs/nwjs-sdk-v0.77.0-win-x64/* output/win64/TiddlyDesktop-win64-v$(./bin/get-version-number)
5064
cp -RH source/* output/win64/TiddlyDesktop-win64-v$(./bin/get-version-number)
5165

5266
# # Windows 32-bit App
53-
cp -RH nwjs/nwjs-sdk-v0.71.1-win-ia32/* output/win32/TiddlyDesktop-win32-v$(./bin/get-version-number)
67+
cp -RH nwjs/nwjs-sdk-v0.77.0-win-ia32/* output/win32/TiddlyDesktop-win32-v$(./bin/get-version-number)
5468
cp -RH source/* output/win32/TiddlyDesktop-win32-v$(./bin/get-version-number)
5569

5670
# # Linux 64-bit App
57-
cp -RH nwjs/nwjs-sdk-v0.71.1-linux-x64/* output/linux64/TiddlyDesktop-linux64-v$(./bin/get-version-number)
71+
cp -RH nwjs/nwjs-sdk-v0.77.0-linux-x64/* output/linux64/TiddlyDesktop-linux64-v$(./bin/get-version-number)
5872
cp -RH source/* output/linux64/TiddlyDesktop-linux64-v$(./bin/get-version-number)
5973

6074
# # Linux 32-bit App
61-
cp -RH nwjs/nwjs-sdk-v0.71.1-linux-ia32/* output/linux32/TiddlyDesktop-linux32-v$(./bin/get-version-number)
75+
cp -RH nwjs/nwjs-sdk-v0.77.0-linux-ia32/* output/linux32/TiddlyDesktop-linux32-v$(./bin/get-version-number)
6276
cp -RH source/* output/linux32/TiddlyDesktop-linux32-v$(./bin/get-version-number)

‎download-nwjs.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66

77
# Download nw.js
88

9-
curl --output 'nwjs/nwjs-sdk-v0.71.1-win-x64.zip' 'https://dl.nwjs.io/v0.71.1/nwjs-sdk-v0.71.1-win-x64.zip' || exit 1
10-
curl --output 'nwjs/nwjs-sdk-v0.71.1-win-ia32.zip' 'https://dl.nwjs.io/v0.71.1/nwjs-sdk-v0.71.1-win-ia32.zip' || exit 1
11-
curl --output 'nwjs/nwjs-sdk-v0.71.1-linux-x64.tar.gz' 'https://dl.nwjs.io/v0.71.1/nwjs-sdk-v0.71.1-linux-x64.tar.gz' || exit 1
12-
curl --output 'nwjs/nwjs-sdk-v0.71.1-linux-ia32.tar.gz' 'https://dl.nwjs.io/v0.71.1/nwjs-sdk-v0.71.1-linux-ia32.tar.gz' || exit 1
13-
curl --output 'nwjs/nwjs-sdk-v0.71.1-osx-x64.zip' 'https://dl.nwjs.io/v0.71.1/nwjs-sdk-v0.71.1-osx-x64.zip' || exit 1
9+
curl --output 'nwjs/nwjs-sdk-v0.77.0-win-x64.zip' 'https://dl.nwjs.io/v0.77.0/nwjs-sdk-v0.77.0-win-x64.zip' || exit 1
10+
curl --output 'nwjs/nwjs-sdk-v0.77.0-win-ia32.zip' 'https://dl.nwjs.io/v0.77.0/nwjs-sdk-v0.77.0-win-ia32.zip' || exit 1
11+
curl --output 'nwjs/nwjs-sdk-v0.77.0-linux-x64.tar.gz' 'https://dl.nwjs.io/v0.77.0/nwjs-sdk-v0.77.0-linux-x64.tar.gz' || exit 1
12+
curl --output 'nwjs/nwjs-sdk-v0.77.0-linux-ia32.tar.gz' 'https://dl.nwjs.io/v0.77.0/nwjs-sdk-v0.77.0-linux-ia32.tar.gz' || exit 1
13+
curl --output 'nwjs/nwjs-sdk-v0.77.0-osx-x64.zip' 'https://dl.nwjs.io/v0.77.0/nwjs-sdk-v0.77.0-osx-x64.zip' || exit 1
14+
curl --output 'nwjs/nwjs-sdk-v0.77.0-osx-applesilicon.zip' 'https://dl.nwjs.io/v0.77.0/nwjs-sdk-v0.77.0-osx-arm64.zip' || exit 1
1415

1516
pushd nwjs
1617

‎package.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ popd
1616
pushd ./output/mac64
1717
zip --symlinks -r "../tiddlydesktop-mac64-v$VERSION.zip" *
1818
popd
19+
pushd ./output/macapplesilicon
20+
zip --symlinks -r "../tiddlydesktop-macapplesilicon-v$VERSION.zip" *
21+
popd
1922
pushd ./output/linux32
2023
zip -r "../tiddlydesktop-linux32-v$VERSION.zip" *
2124
popd

‎run.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
./bld.sh || exit 1
66

7-
./output/mac64/TiddlyDesktop-mac64-v$(./bin/get-version-number)/TiddlyDesktop.app/Contents/MacOS/nwjs --debug || exit 1
7+
./output/mac64/TiddlyDesktop-macapplesilicon-v$(./bin/get-version-number)/TiddlyDesktop.app/Contents/MacOS/nwjs --debug || exit 1

0 commit comments

Comments
 (0)