From 90f7a205a6b6fd3bf3963dafd5c090734fa73f68 Mon Sep 17 00:00:00 2001 From: Brendan Doherty Date: Sat, 13 Aug 2022 05:48:24 +1200 Subject: [PATCH 1/3] changes needed to build on windows --- packages/desktop-client/package.json | 4 ++-- packages/loot-core/bin/build-browser | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json index 4b347da..383b913 100644 --- a/packages/desktop-client/package.json +++ b/packages/desktop-client/package.json @@ -85,10 +85,10 @@ }, "scripts": { "start": "cross-env PORT=3001 node scripts/start.js", - "start:browser": "./bin/watch-browser", + "start:browser": "cross-env ./bin/watch-browser", "watch": "cross-env PORT=3001 node scripts/start.js", "build": "cross-env INLINE_RUNTIME_CHUNK=false node scripts/build.js", - "build:browser": "./bin/build-browser" + "build:browser": "cross-env./bin/build-browser" }, "browserslist": [ "electron 3.0" diff --git a/packages/loot-core/bin/build-browser b/packages/loot-core/bin/build-browser index 2430750..2e0d168 100755 --- a/packages/loot-core/bin/build-browser +++ b/packages/loot-core/bin/build-browser @@ -22,6 +22,7 @@ if [ $NODE_ENV == 'development' ]; then # Make sure to do this before starting the build since watch mode # will block WEBPACK_ARGS="$WEBPACK_ARGS --watch" + export MSYS=winsymlinks:nativestrict ln -snf "$ROOT"/../lib-dist/browser ../../desktop-client/public/kcab fi From 18e6eac11678e14016bb60522b040a46e290f9be Mon Sep 17 00:00:00 2001 From: bdoherty Date: Wed, 31 Aug 2022 07:31:03 +1200 Subject: [PATCH 2/3] Conditionally set MSYS Co-authored-by: Tom French <15848336+TomAFrench@users.noreply.github.com> --- packages/loot-core/bin/build-browser | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/loot-core/bin/build-browser b/packages/loot-core/bin/build-browser index 2e0d168..c2888de 100755 --- a/packages/loot-core/bin/build-browser +++ b/packages/loot-core/bin/build-browser @@ -22,7 +22,10 @@ if [ $NODE_ENV == 'development' ]; then # Make sure to do this before starting the build since watch mode # will block WEBPACK_ARGS="$WEBPACK_ARGS --watch" - export MSYS=winsymlinks:nativestrict + if [ "$OSTYPE" == "msys" ]; then + // Ensure symlinks are created as native Windows symlinks. + export MSYS=winsymlinks:nativestrict + fi ln -snf "$ROOT"/../lib-dist/browser ../../desktop-client/public/kcab fi From e638cdf4673c2ca46ebf699427b8f0c09d659407 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Tue, 30 Aug 2022 20:35:57 +0100 Subject: [PATCH 3/3] fix: use correct comment style --- packages/loot-core/bin/build-browser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/loot-core/bin/build-browser b/packages/loot-core/bin/build-browser index c2888de..0ae89a5 100755 --- a/packages/loot-core/bin/build-browser +++ b/packages/loot-core/bin/build-browser @@ -23,7 +23,7 @@ if [ $NODE_ENV == 'development' ]; then # will block WEBPACK_ARGS="$WEBPACK_ARGS --watch" if [ "$OSTYPE" == "msys" ]; then - // Ensure symlinks are created as native Windows symlinks. + # Ensure symlinks are created as native Windows symlinks. export MSYS=winsymlinks:nativestrict fi ln -snf "$ROOT"/../lib-dist/browser ../../desktop-client/public/kcab