From e06e63d44caeb72061a2e59e6efc40bee034d680 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Wed, 10 Apr 2019 23:38:43 -0400
Subject: add build machinery for electron

---
 bin/build-electron | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100755 bin/build-electron

(limited to 'bin/build-electron')

diff --git a/bin/build-electron b/bin/build-electron
new file mode 100755
index 00000000..f63223ac
--- /dev/null
+++ b/bin/build-electron
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+cd electron
+
+if [ "$BUILD" = "windows" ]; then
+  NPM="wine 'C:\node\npm'"
+else
+  NPM="npm"
+fi
+
+$NPM install
+$NPM update
+$NPM run package
-- 
cgit v1.2.3


From 22eabd00c1f407f1793191e34d2df4cb97e858cf Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Thu, 11 Apr 2019 00:05:36 -0400
Subject: fix windows npm invocation

---
 bin/build-electron | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/build-electron')

diff --git a/bin/build-electron b/bin/build-electron
index f63223ac..032a7fee 100755
--- a/bin/build-electron
+++ b/bin/build-electron
@@ -3,7 +3,7 @@
 cd electron
 
 if [ "$BUILD" = "windows" ]; then
-  NPM="wine 'C:\node\npm'"
+  NPM="wine cmd /c 'C:\node\npm.cmd'"
 else
   NPM="npm"
 fi
-- 
cgit v1.2.3


From aae92ceca51469292f9ea2ab4386e963e6a33716 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Thu, 11 Apr 2019 00:22:08 -0400
Subject: refix windows

---
 bin/build-electron | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/build-electron')

diff --git a/bin/build-electron b/bin/build-electron
index 032a7fee..ccf98b14 100755
--- a/bin/build-electron
+++ b/bin/build-electron
@@ -3,7 +3,7 @@
 cd electron
 
 if [ "$BUILD" = "windows" ]; then
-  NPM="wine cmd /c 'C:\node\npm.cmd'"
+  NPM="wine cmd /c C:\\node\\npm.cmd"
 else
   NPM="npm"
 fi
-- 
cgit v1.2.3


From 0d54c828d0477db8666ff24d451591d9f7fdcf57 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Fri, 12 Apr 2019 01:41:14 -0400
Subject: use docker for windows

---
 bin/build-electron | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'bin/build-electron')

diff --git a/bin/build-electron b/bin/build-electron
index ccf98b14..1c0c6e58 100755
--- a/bin/build-electron
+++ b/bin/build-electron
@@ -1,13 +1,14 @@
 #!/bin/bash
 
-cd electron
-
 if [ "$BUILD" = "windows" ]; then
-  NPM="wine cmd /c C:\\node\\npm.cmd"
+  docker run --rm \
+    -e ELECTRON_CACHE=$HOME/.cache/electron \
+    -v ${PWD}/electron:/project \
+    -v ~/.cache/electron:/root/.cache/electron \
+    electronuserland/builder:wine \
+    /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn run dist"
 else
-  NPM="npm"
+  cd electron
+  yarn install
+  yarn run dist
 fi
-
-$NPM install
-$NPM update
-$NPM run package
-- 
cgit v1.2.3


From f85395b9a6e318406cbac12d639944173ab8a898 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Fri, 12 Apr 2019 15:29:00 -0400
Subject: use docker for linux too and npm for mac

---
 bin/build-electron | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'bin/build-electron')

diff --git a/bin/build-electron b/bin/build-electron
index 1c0c6e58..b4887268 100755
--- a/bin/build-electron
+++ b/bin/build-electron
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ "$BUILD" = "windows" ]; then
+if [ "$BUILD" = "windows" -o "$BUILD" = "linux" ]; then
   docker run --rm \
     -e ELECTRON_CACHE=$HOME/.cache/electron \
     -v ${PWD}/electron:/project \
@@ -9,6 +9,6 @@ if [ "$BUILD" = "windows" ]; then
     /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn run dist"
 else
   cd electron
-  yarn install
-  yarn run dist
+  npm install
+  npm run dist
 fi
-- 
cgit v1.2.3


From a87694dc61d7e90f63efb05666e7fd308f447652 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Fri, 12 Apr 2019 15:38:54 -0400
Subject: get the right architecture

---
 bin/build-electron | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'bin/build-electron')

diff --git a/bin/build-electron b/bin/build-electron
index b4887268..d8ce78b8 100755
--- a/bin/build-electron
+++ b/bin/build-electron
@@ -1,12 +1,18 @@
 #!/bin/bash
 
 if [ "$BUILD" = "windows" -o "$BUILD" = "linux" ]; then
+  if [ "$BUILD" = "windows" ]; then
+    args="-w --ia32"
+  else
+    args="-l --x64"
+  fi
+
   docker run --rm \
     -e ELECTRON_CACHE=$HOME/.cache/electron \
     -v ${PWD}/electron:/project \
     -v ~/.cache/electron:/root/.cache/electron \
     electronuserland/builder:wine \
-    /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn run dist"
+    /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn run dist ${args}"
 else
   cd electron
   npm install
-- 
cgit v1.2.3