Release 1.8.0 (#20)

* Adding quickwrite functionality

* Modifying installer

* Adding installer icon

* Removing version from folder name

* Modifying templates

* Further tuning installer

* Changing launcher script and always using quickflash

* Adding line

* Yet another change

* Making another change

* Replacing installer

* Adjusting script

* Fixing reference

* Fixing link

* Fixing script

* Showing folder

* Doing tree

* Changing paths

* Ensuring same version

* New verison

* Back to 6.7.0

* Aligning toolchain

Author: ifilot

.github/workflows/build.yml

@@ -62,67 +62,66 @@ jobs:
       with:
         name: ${{env.EXEC}}
         path: ${{github.workspace}}/build/Release/${{env.EXEC}}
-  
-  # create packaging metadata
-  prepare-installer-windows:
-    runs-on: ubuntu-latest
-    needs: build-gui-windows
-    permissions: write-all
-    steps:
-    - uses: actions/checkout@v3
-    - name: install dependencies
-      run: sudo apt-get update && sudo apt-get install -y python3 python3-jinja2
-    - name: run packaging script
-      run: python3 gui/packaging/package.py
-    - name: Upload packaging scripts
-      uses: actions/upload-artifact@v4
-      with:
-        name: package-metadata
-        path: |
-          ${{github.workspace}}/gui/packaging/config/config.xml
-          ${{github.workspace}}/gui/packaging/packages/com.vendor.product/meta/installscript.qs
-          ${{github.workspace}}/gui/packaging/packages/com.vendor.product/meta/package.xml
 
   # create Windows installer
   create-installer-windows:
     runs-on: windows-latest
-    needs: prepare-installer-windows
+    needs: build-gui-windows
     permissions: write-all
     steps:
     - uses: actions/checkout@v3
-    - name: Install Qt
+
+    - name: Download built executable
+      uses: actions/download-artifact@v4
+      with:
+        name: ${{env.EXEC}}
+        path: gui/packaging/data/
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.11"
+
+    - name: Install dependencies
+      run: pip install jinja2
+
+    - name: Install Qt (windeployqt)
       uses: jurplel/install-qt-action@v3
       with:
         version: '6.7.0'
+        host: windows
         target: 'desktop'
         arch: 'win64_msvc2019_64'
+        tools: 'tools_opensslv3_x64'
         modules: 'qtserialport'
-        tools: 'tools_ifw tools_opensslv3_x64'
         cache: true
-    - name: Download artifact
-      uses: actions/download-artifact@v4
-      with:
-        name: ${{env.EXEC}}
-        path: gui/packaging/packages/com.vendor.product/data/
-    - name: Download installer metadata
-      uses: actions/download-artifact@v4
-      with:
-        name: package-metadata
-        path: ${{github.workspace}}/gui/packaging
-    - name: Get dependencies
-      run: windeployqt.exe gui\packaging\packages\com.vendor.product\data\${{env.EXEC}} --release --force
-    - name: Copy assets
-      run: copy gui\assets\icon\eeprom_icon.ico gui\packaging\packages\com.vendor.product\data\eeprom_icon.ico
-    - name: Create installer
+
+    - name: Run windeployqt
+      run: |
+        & "${{ env.Qt6_DIR }}\bin\windeployqt.exe" gui\packaging\data\${{ env.EXEC }} --release --force
+
+    - name: Copy icon
+      run: copy gui\assets\icon\eeprom_icon.ico gui\packaging\data\
+
+    - name: Generate Inno Setup script
+      run: python gui/packaging/package.py
+
+    - name: Install Inno Setup
+      run: |
+        Invoke-WebRequest -Uri "https://jrsoftware.org/download.php/ispack.exe" -OutFile "ispack.exe"
+        Start-Process -Wait -FilePath ".\ispack.exe" -ArgumentList "/verysilent", "/norestart"
+      shell: powershell
+
+    - name: Build installer
+      shell: cmd
       run: |
-        dir ${{github.workspace}}\..\Qt\Tools\QtInstallerFramework
-        ${{github.workspace}}\..\Qt\Tools\QtInstallerFramework\4.7\bin\binarycreator.exe -c config\config.xml -p packages ${{env.PROGNAME}}-installer-win64.exe
-      working-directory: gui/packaging
+        "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" gui\packaging\setup.iss
+
     - name: Upload installer
       uses: actions/upload-artifact@v4
       with:
         name: ${{env.PROGNAME}}-installer-win64.exe
-        path: gui/packaging/${{env.PROGNAME}}-installer-win64.exe
+        path: gui/packaging/installer/*.exe
 
   # deploy Windows installer
   deploy-installer-windows:

gui/packaging/.gitignore

@@ -0,0 +1,3 @@
+data
+installer
+setup.iss

gui/packaging/config/config.xml

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# clean any previous data
+rm -rvf data
+
+# create folder
+mkdir -v data
+
+# copy executable
+cp -v ../build/release/pico-sst39sf0x0-programmer.exe data/
+
+# run windeploy
+/c/Qt/6.9.1/mingw_64/bin/windeployqt.exe data/pico-sst39sf0x0-programmer.exe --release --force
+
+# copy icon
+cp -v ../../gui/assets/icon/eeprom_icon.ico data/
+
+# build installer script
+/C/Users/iawfi/anaconda3/python.exe package.py
+
+# create installer
+/c/Program\ Files\ \(x86\)/Inno\ Setup\ 6/ISCC.exe setup.iss

gui/packaging/config/config.xml.template

@@ -14,7 +14,7 @@ def main():
     # set names and folders
     variables = {
         'publisher': 'retrohacks.nl',
-        'progfolder': 'pico-sst39sf0x0-programmer-' + version,
+        'progfolder': 'pico-sst39sf0x0-programmer',
         'executable': 'pico-sst39sf0x0-programmer',
         'progdescription': 'PICO SST39SF0x0 Programmer',
         'progname': 'PICO SST39SF0x0 Programmer',
@@ -29,14 +29,13 @@ def main():
 def render(templates, filenames, variables):
     for template, filename in zip(templates, filenames):
         content = template.render(variables)
+        print('Writing to: %s' % filename)
         with open(filename, 'w', encoding='utf-8') as f:
             f.write(content)
 
 def read_templates():
     templates = [
-        os.path.join(ROOT, 'config', 'config.xml'),
-        os.path.join(ROOT, 'packages', 'com.vendor.product', 'meta', 'installscript.qs'),
-        os.path.join(ROOT, 'packages', 'com.vendor.product', 'meta', 'package.xml'),
+        os.path.join(ROOT, 'setup.iss'),
     ]
 
     jinja_templates = []