Skip to content

Commit

Permalink
added linux ia32 build
Browse files Browse the repository at this point in the history
  • Loading branch information
zadam committed Dec 27, 2017
1 parent f6d481a commit 6405d6e
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 14 deletions.
10 changes: 8 additions & 2 deletions bin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,15 @@ cp -r ../trilium-node-binaries/sqlite/* node_modules/sqlite3/lib/binding/

cp -r ../trilium-node-binaries/scrypt/* node_modules/scrypt/bin/

./node_modules/.bin/electron-rebuild
./node_modules/.bin/electron-rebuild --arch=ia32

./node_modules/.bin/electron-packager . --out=dist --platform=linux,win32 --overwrite
./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=ia32 --overwrite

./node_modules/.bin/electron-rebuild --arch=x64

./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=x64 --overwrite

./node_modules/.bin/electron-packager . --out=dist --platform=win32 --arch=x64 --overwrite

# can't copy this before the packaging because the same file name is used for both linux and windows build
cp ../trilium-node-binaries/scrypt.node ./dist/trilium-win32-x64/resources/app/node_modules/scrypt/build/Release/
11 changes: 7 additions & 4 deletions bin/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ VERSION=`jq -r ".version" package.json`

cd dist

echo "Packaging windows electron distribution..."
7z a trilium-windows-${VERSION}.7z trilium-win32-x64
echo "Packaging linux x64 electron distribution..."
7z a trilium-linux-x64-${VERSION}.7z trilium-linux-x64

echo "Packaging linux electron distribution..."
7z a trilium-linux-${VERSION}.7z trilium-linux-x64
echo "Packaging linux ia32 electron distribution..."
7z a trilium-linux-ia32-${VERSION}.7z trilium-linux-ia32

echo "Packaging windows x64 electron distribution..."
7z a trilium-windows-x64-${VERSION}.7z trilium-win32-x64
24 changes: 16 additions & 8 deletions bin/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,27 +44,35 @@ bin/build.sh

bin/package.sh

LINUX_BUILD=trilium-linux-$VERSION.7z
WINDOWS_BUILD=trilium-windows-$VERSION.7z
LINUX_X64_BUILD=trilium-linux-x64-$VERSION.7z
LINUX_IA32_BUILD=trilium-linux-ia32-$VERSION.7z
WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.7z

echo "Creating release in GitHub"

github-release release \
--tag $TAG \
--name "$TAG release"

echo "Uploading linux build"
echo "Uploading linux x64 build"

github-release upload \
--tag $TAG \
--name "$LINUX_BUILD" \
--file "dist/$LINUX_BUILD"
--name "$LINUX_X64_BUILD" \
--file "dist/$LINUX_X64_BUILD"

echo "Uploading windows build"
echo "Uploading linux ia32 build"

github-release upload \
--tag $TAG \
--name "$WINDOWS_BUILD" \
--file "dist/$WINDOWS_BUILD"
--name "$LINUX_IA32_BUILD" \
--file "dist/$LINUX_IA32_BUILD"

echo "Uploading windows x64 build"

github-release upload \
--tag $TAG \
--name "$WINDOWS_X64_BUILD" \
--file "dist/$WINDOWS_X64_BUILD"

echo "Release finished!"
1 change: 1 addition & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ function createMainWindow() {
const win = new electron.BrowserWindow({
width: 1200,
height: 900,
title: 'Trilium Notes',
icon: path.join(__dirname, 'public/images/app-icons/png/256x256.png')
});

Expand Down

0 comments on commit 6405d6e

Please sign in to comment.