From 348562352c024a3e1b7638979f1a0a044b992409 Mon Sep 17 00:00:00 2001 From: azivner Date: Sat, 12 Jan 2019 19:48:45 +0100 Subject: [PATCH] fixes in ASAR build and zipping --- bin/build-linux-x64.sh | 14 +++++--------- bin/build-mac-x64.sh | 35 ++++++++++++++++++++--------------- bin/build-server.sh | 3 ++- bin/build-win-x64.sh | 31 +++++++++++++++++++------------ bin/release.sh | 8 ++++---- bin/reset-local.sh | 3 +++ 6 files changed, 53 insertions(+), 41 deletions(-) create mode 100755 bin/reset-local.sh diff --git a/bin/build-linux-x64.sh b/bin/build-linux-x64.sh index 4bbe50646..c260ee9d5 100755 --- a/bin/build-linux-x64.sh +++ b/bin/build-linux-x64.sh @@ -3,22 +3,18 @@ BUILD_DIR=./dist/trilium-linux-x64 rm -rf $BUILD_DIR -# we build x64 as second so that we keep X64 binaries in node_modules for local development and server build -echo "Rebuilding binaries for linux-x64" -./node_modules/.bin/electron-rebuild --arch=x64 +rm -r node_modules/sqlite3/lib/binding/* + +cp -r bin/deps/linux-x64/sqlite/* node_modules/sqlite3/lib/binding/ ./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR -rm -r "$BUILD_DIR/resources/app/node_modules/sqlite3/lib/binding/*" - -cp -r bin/deps/linux-x64/sqlite/electron* "$BUILD_DIR/resources/app/node_modules/sqlite3/lib/binding/" - -rm -r $BUILD_DIR/resources/app/bin/deps # removing software WebGL binaries because they are pretty huge and not necessary rm -r $BUILD_DIR/swiftshader echo "Packaging linux x64 electron distribution..." VERSION=`jq -r ".version" package.json` -7z a $BUILD_DIR-${VERSION}.7z $BUILD_DIR \ No newline at end of file + +tar cJf $BUILD_DIR-${VERSION}.tar.xz $BUILD_DIR diff --git a/bin/build-mac-x64.sh b/bin/build-mac-x64.sh index a00be16e0..0ba800a77 100755 --- a/bin/build-mac-x64.sh +++ b/bin/build-mac-x64.sh @@ -3,25 +3,30 @@ BUILD_DIR=./dist/trilium-mac-x64 rm -rf $BUILD_DIR -./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=src/public/images/app-icons/mac/icon.icns +echo "Copying required mac binaries" + +rm -r node_modules/sqlite3/lib/binding/* +rm -r node_modules/mozjpeg/vendor/* +rm -r node_modules/pngquant-bin/vendor/* +rm -r node_modules/giflossy/vendor/* + +cp -r bin/deps/mac-x64/sqlite/* node_modules/sqlite3/lib/binding/ +cp bin/deps/mac-x64/image/cjpeg node_modules/mozjpeg/vendor/ +cp bin/deps/mac-x64/image/pngquant node_modules/pngquant-bin/vendor/ +cp bin/deps/mac-x64/image/gifsicle node_modules/giflossy/vendor/ + +./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=src/public/images/app-icons/mac/icon.icns # Mac build has by default useless directory level mv "./dist/Trilium Notes-darwin-x64" $BUILD_DIR -echo "Copying required mac binaries" +./reset-local.sh -MAC_RES_DIR=$BUILD_DIR/Trilium\ Notes.app/Contents/Resources/app - -rm -r "$MAC_RES_DIR/node_modules/sqlite3/lib/binding/*" - -cp -r bin/deps/mac-x64/sqlite/* "$MAC_RES_DIR/node_modules/sqlite3/lib/binding/" -cp bin/deps/mac-x64/image/cjpeg "$MAC_RES_DIR/node_modules/mozjpeg/vendor/" -cp bin/deps/mac-x64/image/pngquant "$MAC_RES_DIR/node_modules/pngquant-bin/vendor/" -cp bin/deps/mac-x64/image/gifsicle "$MAC_RES_DIR/node_modules/giflossy/vendor/" - -rm -r "$MAC_RES_DIR/bin/deps" - -echo "Packaging mac x64 electron distribution..." +echo "Zipping mac x64 electron distribution..." VERSION=`jq -r ".version" package.json` -7z a $BUILD_DIR-${VERSION}.7z $BUILD_DIR \ No newline at end of file + +cd dist + +rm trilium-mac-x64-${VERSION}.zip +zip -r9 --symlinks trilium-mac-x64-${VERSION}.zip trilium-mac-x64 diff --git a/bin/build-server.sh b/bin/build-server.sh index ee743c587..99310cc89 100755 --- a/bin/build-server.sh +++ b/bin/build-server.sh @@ -34,4 +34,5 @@ chmod 755 trilium.sh cd .. VERSION=`jq -r ".version" ../package.json` -7z a trilium-linux-x64-server-${VERSION}.7z trilium-linux-x64-server \ No newline at end of file + +tar cJf trilium-linux-x64-server-${VERSION}.tar.gz trilium-linux-x64-server \ No newline at end of file diff --git a/bin/build-win-x64.sh b/bin/build-win-x64.sh index 7225314d0..aca5727b4 100755 --- a/bin/build-win-x64.sh +++ b/bin/build-win-x64.sh @@ -3,23 +3,30 @@ BUILD_DIR=./dist/trilium-windows-x64 rm -rf $BUILD_DIR +echo "Copying required windows binaries" + +rm -r node_modules/sqlite3/lib/binding/* +rm -r node_modules/mozjpeg/vendor/* +rm -r node_modules/pngquant-bin/vendor/* +rm -r node_modules/giflossy/vendor/* + +cp -r bin/deps/win-x64/sqlite/* node_modules/sqlite3/lib/binding/ +cp bin/deps/win-x64/image/cjpeg.exe node_modules/mozjpeg/vendor/ +cp bin/deps/win-x64/image/pngquant.exe node_modules/pngquant-bin/vendor/ +cp bin/deps/win-x64/image/gifsicle.exe node_modules/giflossy/vendor/ + ./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=win32 --arch=x64 --overwrite --icon=src/public/images/app-icons/win/icon.ico mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR -echo "Copying required windows binaries" - -WIN_RES_DIR=$BUILD_DIR/resources/app - -cp -r bin/deps/win-x64/sqlite/* $WIN_RES_DIR/node_modules/sqlite3/lib/binding/ -cp bin/deps/win-x64/image/cjpeg.exe $WIN_RES_DIR/node_modules/mozjpeg/vendor/ -cp bin/deps/win-x64/image/pngquant.exe $WIN_RES_DIR/node_modules/pngquant-bin/vendor/ -cp bin/deps/win-x64/image/gifsicle.exe $WIN_RES_DIR/node_modules/giflossy/vendor/ - -rm -r $WIN_RES_DIR/bin/deps # removing software WebGL binaries because they are pretty huge and not necessary rm -r $BUILD_DIR/swiftshader -echo "Packaging windows x64 electron distribution..." +./reset-local.sh + +echo "Zipping windows x64 electron distribution..." VERSION=`jq -r ".version" package.json` -7z a $BUILD_DIR-${VERSION}.7z $BUILD_DIR + +cd dist + +zip -r9 trilium-windows-x64-${VERSION}.zip trilium-windows-x64 diff --git a/bin/release.sh b/bin/release.sh index 1abf0fc00..b0eed90b4 100755 --- a/bin/release.sh +++ b/bin/release.sh @@ -42,10 +42,10 @@ git push origin $TAG bin/build.sh -LINUX_X64_BUILD=trilium-linux-x64-$VERSION.7z -WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.7z -MAC_X64_BUILD=trilium-mac-x64-$VERSION.7z -SERVER_BUILD=trilium-linux-x64-server-$VERSION.7z +LINUX_X64_BUILD=trilium-linux-x64-$VERSION.tar.gz +WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.zip +MAC_X64_BUILD=trilium-mac-x64-$VERSION.zip +SERVER_BUILD=trilium-linux-x64-server-$VERSION.tar.gz echo "Creating release in GitHub" diff --git a/bin/reset-local.sh b/bin/reset-local.sh new file mode 100755 index 000000000..37e2a1d7d --- /dev/null +++ b/bin/reset-local.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +./node_modules/.bin/electron-rebuild --arch=x64 \ No newline at end of file