From 98f2ec28ce96b7d71e698a4ee4cba49c41a6c68b Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Wed, 7 Jun 2023 13:26:43 +0200
Subject: [PATCH] update build scripts

---
 frontend/vue.config.js      | 19 ++++++++++++++++-
 packaging/package.sh        | 41 +++++++++++++++----------------------
 packaging/packageLinux.sh   | 22 ++++++++------------
 packaging/packageTesting.sh | 31 ++++++++++++++++++++++++++++
 packaging/packageWindows.sh | 28 ++++++++++---------------
 5 files changed, 85 insertions(+), 56 deletions(-)
 create mode 100755 packaging/packageTesting.sh

diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index c6c6115..b62a7d5 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -1,7 +1,24 @@
 module.exports = {
   pluginOptions: {
     electronBuilder: {
-      nodeIntegration: true
+      nodeIntegration: true,
+      builderOptions: {
+        files: [
+          "**/*",
+          {
+            from: "./*",
+            to: "./*",
+            filter: [ "**/*" ]
+          }
+        ],
+        extraFiles: [
+          {
+            from: "./lib",
+            to: "./",
+            filter: [ "**/*" ]
+          }
+        ]
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/packaging/package.sh b/packaging/package.sh
index 510d611..66d803b 100755
--- a/packaging/package.sh
+++ b/packaging/package.sh
@@ -4,26 +4,29 @@ cd ..
 
 # Compile for Linux
 pyinstaller smuL-cli.spec
-cp -rv ./dist/smuL-cli/* ./frontend/
+
+mkdir ./frontend/lib/
+cp -rv ./dist/smuL-cli/* ./frontend/lib/
 
 
 # Copy python files
-cp -rv ./bin ./frontend/
-cp -rv ./config ./frontend/
-cp -v ./smuL-cli.py ./frontend/
-cp -v ./LICENSE ./frontend/
-cp -v ./logo.png ./frontend/
+cp -rv ./bin ./frontend/lib/
+cp -rv ./config ./frontend/lib/
+cp -v ./smuL-cli.py ./frontend/lib/
+cp -v ./LICENSE ./frontend/lib/
+cp -v ./logo.png ./frontend/lib/
 
 
 # package for Linux (includes GUI & CLI)
 cd frontend
+rm -rf ./dist_electron
 npm run electron:build -- --linux deb rpm
 
-rm -rf ./libdynload
-rm ./image*
-rm ./lib*
-rm ./ld*
-rm ./base_library.zip
+rm -rf ./lib/libdynload
+rm ./lib/smuL*
+rm ./lib/lib*
+rm ./lib/ld*
+rm ./lib/base_library.zip
 
 cd ..
 
@@ -34,24 +37,14 @@ printf '\n\n==> Finished Linux packaging, preparing Windows\n\n'
 
 # Compile for Windows
 wine python -m PyInstaller smuL-cli.spec
-cp -rv ./dist/smuL-cli/* ./frontend/
-cp -v ./smuL-cli.py ./frontend/
+cp -rv ./dist/smuL-cli/* ./frontend/lib/
+cp -v ./smuL-cli.py ./frontend/lib/
 
 # package for Windows (includes GUI & CLI)
 cd frontend
 npm run electron:build -- --win nsis
 
-rm -rf ./bin
-rm -rf ./config
-rm -rf ./lib-dynload
-rm ./smuL*
-rm ./_*
-rm ./py*
-rm ./lib*
-rm ./base_library.zip
-rm ./*.pyd
-rm ./*.dll
-rm ./LICENSE
+rm -rf ./lib
 
 cd ..
 
diff --git a/packaging/packageLinux.sh b/packaging/packageLinux.sh
index 1f66788..86edd7d 100755
--- a/packaging/packageLinux.sh
+++ b/packaging/packageLinux.sh
@@ -4,29 +4,23 @@ cd ..
 
 # Compile for Linux
 pyinstaller smuL-cli.spec
-cp -r ./dist/smuL-cli/* ./frontend/
+cp -r ./dist/smuL-cli/* ./frontend/lib/
 
 
 # Copy python files
-cp -r ./bin ./frontend/
-cp -r ./config ./frontend/
-cp ./smuL-cli.py ./frontend/
-cp ./LICENSE ./frontend/
-cp ./logo.png ./frontend/
+cp -r ./bin ./frontend/lib/
+cp -r ./config ./frontend/lib/
+cp ./smuL-cli.py ./frontend/lib/
+cp ./LICENSE ./frontend/lib/
+cp ./logo.png ./frontend/lib/
 
 
 # package for Linux (includes GUI & CLI)
 cd frontend
+rm -rf ./dist_electron
 npm run electron:build -- --linux deb rpm
 
-rm -rf ./bin
-rm -rf ./config
-rm -rf ./libdynload
-rm ./smuL*
-rm ./lib*
-rm ./ld*
-rm ./base_library.zip
-rm ./LICENSE
+rm -rf ./lib
 
 cd ..
 
diff --git a/packaging/packageTesting.sh b/packaging/packageTesting.sh
new file mode 100755
index 0000000..446cd13
--- /dev/null
+++ b/packaging/packageTesting.sh
@@ -0,0 +1,31 @@
+#! /bin/bash
+
+cd ..
+
+# Compile for Linux
+pyinstaller smuL-cli.spec
+mkdir ./frontend/lib
+cp -r ./dist/smuL-cli/* ./frontend/lib/
+
+
+# Copy python files
+cp -r ./bin ./frontend/lib/
+cp -r ./config ./frontend/lib/
+cp ./smuL-cli.py ./frontend/lib/
+cp ./LICENSE ./frontend/lib/
+cp ./logo.png ./frontend/lib/
+
+
+# package for Linux (includes GUI & CLI)
+cd frontend
+rm -rf ./dist_electron
+npm run electron:build -- --linux zip
+
+rm -rf ./lib
+
+cd ..
+
+rm -rf ./build
+rm -rf ./dist
+
+printf '\n\n==> DONE\n\n'
\ No newline at end of file
diff --git a/packaging/packageWindows.sh b/packaging/packageWindows.sh
index 3905586..3733a54 100755
--- a/packaging/packageWindows.sh
+++ b/packaging/packageWindows.sh
@@ -4,30 +4,24 @@ cd ..
 
 # Compile for Windows
 wine python -m PyInstaller smuL-cli.spec
-cp -r ./dist/smuL-cli/* ./frontend/
+
+mkdir ./frontend/lib
+
+cp -r ./dist/smuL-cli/* ./frontend/lib/
 
 # Copy python files
-cp -rv ./bin ./frontend/
-cp -rv ./config ./frontend/
-cp -v ./smuL-cli.py ./frontend/
-cp -v ./LICENSE ./frontend/
-cp -v ./logo.png ./frontend/
+cp -rv ./bin ./frontend/lib/
+cp -rv ./config ./frontend/lib/
+cp -v ./smuL-cli.py ./frontend/lib/
+cp -v ./LICENSE ./frontend/lib/
+cp -v ./logo.png ./frontend/lib/
 
 # package for Windows (includes GUI & CLI)
 cd frontend
+rm -rf ./dist_electron
 npm run electron:build -- --win nsis
 
-rm -rf ./bin
-rm -rf ./config
-rm -rf ./lib-dynload
-rm ./smuL*
-rm ./_*
-rm ./py*
-rm ./lib*
-rm ./base_library.zip
-rm ./*.pyd
-rm ./*.dll
-rm ./LICENSE
+rm -rf ./lib
 
 cd ..