Merge pull request #71 from pennam/update-packaging

Update packaging

Author: pennam

package.sh

@@ -0,0 +1,22 @@
+VERSION="0.5.0"
+mkdir -p $VERSION
+echo "Build in release mode"
+bash export.sh > $VERSION/release.log 2>&1
+echo "Create release zip"
+zip -r $VERSION/unor4wifi-$VERSION-release.zip UNOR4USBBridge/build
+echo "Create unpdater packages"
+pushd unor4wifi-updater
+bash package.sh $VERSION > ../$VERSION/updater.log 2>&1
+popd
+mv unor4wifi-updater/unor4wifi-update-windows.zip $VERSION/unor4wifi-update-windows.zip
+mv unor4wifi-updater/unor4wifi-update-linux.zip $VERSION/unor4wifi-update-linux.zip
+mv unor4wifi-updater/unor4wifi-update-macos.zip $VERSION/unor4wifi-update-macos.zip
+echo "Build in debug mode"
+sed -i 's/DebugLevel=none/DebugLevel=verbose/g' compile.sh
+sed -i 's/DBG_ERROR/DBG_VERBOSE/g' UNOR4USBBridge/UNOR4USBBridge.ino
+bash export.sh > $VERSION/debug.log 2>&1
+echo "Create debug zip"
+zip -r $VERSION/unor4wifi-$VERSION-debug.zip UNOR4USBBridge/build
+echo "Done"
+echo "..."
+echo "Remember to restore compile script and .ino file"

unor4wifi-updater/package.sh

@@ -12,7 +12,7 @@ function package_windows() {
     unzip /tmp/unor4wifi-reboot-windows.zip -d unor4wifi-update-windows/bin
 
     sed s#VVERSION#$VERSION#g update_windows.bat > unor4wifi-update-windows/update.bat
-    cp ../UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3-ALL.bin unor4wifi-update-windows/firmware/UNOR4-WIFI-S3-$VERSION.bin
+    cp ../UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3-BOOT-APP.bin unor4wifi-update-windows/firmware/UNOR4-WIFI-S3-$VERSION.bin
 
     zip -r unor4wifi-update-windows.zip unor4wifi-update-windows
 
@@ -30,7 +30,7 @@ function package_linux() {
     unzip /tmp/unor4wifi-reboot-linux64.zip -d unor4wifi-update-linux/bin
 
     sed s#VVERSION#$VERSION#g update_linux.sh > unor4wifi-update-linux/update.sh
-    cp ../UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3-ALL.bin unor4wifi-update-linux/firmware/UNOR4-WIFI-S3-$VERSION.bin
+    cp ../UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3-BOOT-APP.bin unor4wifi-update-linux/firmware/UNOR4-WIFI-S3-$VERSION.bin
 
     zip -r unor4wifi-update-linux.zip unor4wifi-update-linux
 
@@ -49,13 +49,18 @@ function package_macos() {
     unzip /tmp/unor4wifi-reboot-macos.zip -d unor4wifi-update-macos/bin
 
     sed s#VVERSION#$VERSION#g update_mac.command > unor4wifi-update-macos/update.command
-    cp ../UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3-ALL.bin unor4wifi-update-macos/firmware/UNOR4-WIFI-S3-$VERSION.bin
+    cp ../UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3-BOOT-APP.bin unor4wifi-update-macos/firmware/UNOR4-WIFI-S3-$VERSION.bin
 
     zip -r unor4wifi-update-macos.zip unor4wifi-update-macos
 
 }
 
-VERSION="0.5.0"
+if [ -z "$1" ]; then
+    echo "No argument supplied"
+    exit 1
+fi
+
+VERSION=$1
 
 # Cleanup before starting
 rm -rf unor4wifi-update-linux*