diff --git a/bin/better-sqlite3/mac-arm64-better_sqlite3.node b/bin/better-sqlite3/mac-arm64-better_sqlite3.node new file mode 100644 index 000000000..9709dcd23 Binary files /dev/null and b/bin/better-sqlite3/mac-arm64-better_sqlite3.node differ diff --git a/bin/better-sqlite3/mac-better_sqlite3.node b/bin/better-sqlite3/mac-x64-better_sqlite3.node similarity index 100% rename from bin/better-sqlite3/mac-better_sqlite3.node rename to bin/better-sqlite3/mac-x64-better_sqlite3.node diff --git a/bin/build-mac-arm64.sh b/bin/build-mac-arm64.sh new file mode 100755 index 000000000..8d1f595a6 --- /dev/null +++ b/bin/build-mac-arm64.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +SRC_DIR=./dist/trilium-mac-arm64-src + +if [ "$1" != "DONTCOPY" ] +then + ./bin/copy-trilium.sh $SRC_DIR +fi + +echo "Copying required mac arm64 binaries" + +cp -r bin/better-sqlite3/mac-arm64-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node + +rm -r $SRC_DIR/src/public/app-dist/*.mobile.* + +echo "Packaging mac arm64 electron build" + +./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=arm64 --overwrite --icon=images/app-icons/mac/icon.icns + +BUILD_DIR=./dist/trilium-mac-arm64 +rm -rf $BUILD_DIR + +# Mac build has by default useless directory level +mv "./dist/Trilium Notes-darwin-arm64" $BUILD_DIR + +cp bin/tpl/anonymize-database.sql $BUILD_DIR/ + +cp -r dump-db $BUILD_DIR/ +rm -rf $BUILD_DIR/dump-db/node_modules + +echo "Zipping mac arm64 electron distribution..." + +VERSION=`jq -r ".version" package.json` + +cd dist + +rm trilium-mac-arm64-${VERSION}.zip +zip -r9 --symlinks trilium-mac-arm64-${VERSION}.zip trilium-mac-arm64 diff --git a/bin/build-mac-x64.sh b/bin/build-mac-x64.sh index 0e63c7fb2..8e560ba41 100755 --- a/bin/build-mac-x64.sh +++ b/bin/build-mac-x64.sh @@ -7,9 +7,9 @@ then ./bin/copy-trilium.sh $SRC_DIR fi -echo "Copying required mac binaries" +echo "Copying required mac x64 binaries" -cp -r bin/better-sqlite3/mac-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node +cp -r bin/better-sqlite3/mac-x64-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node rm -r $SRC_DIR/src/public/app-dist/*.mobile.* diff --git a/bin/build.sh b/bin/build.sh index ff90c288d..6092b2011 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -13,11 +13,14 @@ cp -r $SRC_DIR ./dist/trilium-linux-x64-src cp -r $SRC_DIR ./dist/trilium-linux-x64-server cp -r $SRC_DIR ./dist/trilium-windows-x64-src cp -r $SRC_DIR ./dist/trilium-mac-x64-src +cp -r $SRC_DIR ./dist/trilium-mac-arm64-src bin/build-win-x64.sh DONTCOPY bin/build-mac-x64.sh DONTCOPY +bin/build-mac-arm64.sh DONTCOPY + bin/build-linux-x64.sh DONTCOPY bin/build-server.sh DONTCOPY diff --git a/bin/release.sh b/bin/release.sh index cdaa324d2..a6e193657 100755 --- a/bin/release.sh +++ b/bin/release.sh @@ -48,6 +48,7 @@ LINUX_X64_BUILD=trilium-linux-x64-$VERSION.tar.xz DEBIAN_X64_BUILD=trilium_${VERSION}_amd64.deb WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.zip MAC_X64_BUILD=trilium-mac-x64-$VERSION.zip +MAC_ARM64_BUILD=trilium-mac-arm64-$VERSION.zip SERVER_BUILD=trilium-linux-x64-server-$VERSION.tar.xz echo "Creating release in GitHub" @@ -68,4 +69,5 @@ gh release create "$TAG" \ "dist/$LINUX_X64_BUILD" \ "dist/$WINDOWS_X64_BUILD" \ "dist/$MAC_X64_BUILD" \ + "dist/$MAC_ARM64_BUILD" \ "dist/$SERVER_BUILD"