Tweak build_release_* scripts

Author: ThomasFarstrike

build_release_linux.sh

@@ -16,32 +16,21 @@ read yes
 echo "3) Cleaning up old build..."
 rm -rf .webpack/
 rm -rf dist/
+# Don't include Windows VNC binaries on Linux
+rm -rf vnc-software/uvnc-windows/
 
 # If you run it in dev mode first with:
 # npm run start
 # Then the app tries to connect to localhost:3000 instead of packaging the actual files when building with:
 #./node_modules/.bin/electron-builder
 
 # Therefore, first make sure the correct files are packaged with electron-forge:
-echo "4) Running: electron-forge package"
-./node_modules/.bin/electron-forge package
+echo "4) Packaging with: electron-forge package -p linux -a x64"
+./node_modules/.bin/electron-forge package -p linux -a x64
 
 # NOTE: Don't use prepackage because the electron-builder will not add the tigervnc/ folder:
 #./node_modules/.bin/electron-builder --prepackaged  out/peerviewer-linux-x64/ -l appimage
-echo "5) Running electron-builder --linux appimage zip deb snap rpm"
+echo "5) Building release binaries with: electron-builder --linux appimage deb snap rpm tar.gz"
 export DEBUG=electron-builder
 ./node_modules/.bin/electron-builder --linux appimage deb snap rpm tar.gz
 
-# Building for Windows on Linux doesn't seem to work, see:
-# https://github.com/electron/electron/issues/1075
-# https://github.com/electron-userland/electron-builder/issues/844
-# https://github.com/electron-userland/electron-builder/issues/5254
-#
-# It also requires wine32, see https://www.electron.build/multi-platform-build so something like:
-# dpkg --add-architecture i386 && apt-get update && apt-get install wine32
-#./node_modules/.bin/electron-builder --win nsis portable msi zip
-#
-# To build for Windows, execute on a Windows machine (as Administrator, otherwise symlink permission errors):
-# node_modules\\.bin\\electron-builder --win nsis portable msi zip
-
-

build_release_windows.sh

@@ -0,0 +1,45 @@
+#!/bin/sh
+
+echo "Run this with Administrator privileges because the last step needs it."
+sleep 3
+
+echo "0) make sure all changes are committed"
+diff=$(git diff | wc -l)
+if [ $diff -gt 0 ]; then
+	echo "You have diff"
+	exit 1
+fi
+
+echo "1) make sure devtools are set to false in src/main.js"
+read yes
+
+echo "2) make sure you've incremented the version number in package.json"
+read yes
+
+echo "3) Cleaning up old build..."
+rm -rf .webpack/
+rm -rf dist/
+# dont include linux binaries in Windows build
+rm -rf vnc-software/tigervnc-linux-x86_64/
+
+# first make sure the correct files are packaged with electron-forge:
+echo "4) Packaging with: electron-forge package"
+./node_modules/.bin/electron-forge package -p win32 -a x64
+
+echo "5) Building release binaries with: electron-builder --win nsis portable msi zip"
+# NOTE: Building for Windows on Linux doesn't seem to work, see:
+# https://github.com/electron/electron/issues/1075
+# https://github.com/electron-userland/electron-builder/issues/844
+# https://github.com/electron-userland/electron-builder/issues/5254
+#
+# Building for Windows on Linux also requires wine32, see https://www.electron.build/multi-platform-build so something like:
+# dpkg --add-architecture i386 && apt-get update && apt-get install wine32
+# And then:
+#./node_modules/.bin/electron-builder --win nsis portable msi zip
+
+# Execute on a Windows machine (as Administrator, otherwise symlink permission errors):
+export DEBUG=electron-builder
+node_modules\\.bin\\electron-builder --win nsis portable msi zip
+
+
+