From 74f7fb822c8b2b365cd98d6472b78307bf9c1ae4 Mon Sep 17 00:00:00 2001
From: Caleb Hulbert <cmhulbert@gmail.com>
Date: Tue, 30 Jul 2024 14:36:11 -0400
Subject: [PATCH 1/2] ci: build for windows

---
 .github/workflows/build-installers.yml   | 2 +-
 .github/workflows/publish-installers.yml | 6 +++++-
 pom.xml                                  | 2 +-
 src/packaging/windows/jpackage.txt       | 8 +++++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml
index 8747c80..a0a1d76 100644
--- a/.github/workflows/build-installers.yml
+++ b/.github/workflows/build-installers.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [macos-14, ubuntu-latest, macos-latest]
+        os: [macos-14, windows-latest, ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
diff --git a/.github/workflows/publish-installers.yml b/.github/workflows/publish-installers.yml
index e383898..9325e34 100644
--- a/.github/workflows/publish-installers.yml
+++ b/.github/workflows/publish-installers.yml
@@ -5,7 +5,9 @@ name: Publish Installers
 
 on:
   push:
-    tags: "paintera-conversion-helper-*.*.*"
+    tags:
+     - "paintera-conversion-helper-*.*.*"
+     - "prerelease-*"
   workflow_dispatch:
 
 
@@ -31,6 +33,7 @@ jobs:
           echo "VERSION=$tag_name" >> $GITHUB_ENV
       - name: Rename Artifacts
         run: |
+          mv Paintera-windows-latest-*/*.msi Paintera-${{ env.VERSION }}-Windows.msi
           mv PainteraConvert-ubuntu-latest-*/*.deb PainteraConvert-${{ env.VERSION }}_x86_64.deb
           mv PainteraConvert-macos-latest-*/*.pkg PainteraConvert-${{ env.VERSION }}-MacOS.pkg
           mv PainteraConvert-macos-14-*/*.pkg PainteraConvert-${{ env.VERSION }}-MacOS-AppleSilicon.pkg
@@ -41,6 +44,7 @@ jobs:
           tag_name: ${{ github.ref }}
           prerelease: false
           files: |
+            PainteraConvert-${{ env.VERSION }}-Windows.msi
             PainteraConvert-${{ env.VERSION }}_x86_64.deb
             PainteraConvert-${{ env.VERSION }}-MacOS.pkg
             PainteraConvert-${{ env.VERSION }}-MacOS-AppleSilicon.pkg
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 03fceec..186a018 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
         <jackson.version>2.15.4</jackson.version>
 
         <!-- For JPackage -->
-        <app.version>1.0.1</app.version>
+        <app.version>1.0.2</app.version>
         <app.name>paintera-convert</app.name>
         <jvm.modules>java.naming,java.management,java.sql</jvm.modules>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/packaging/windows/jpackage.txt b/src/packaging/windows/jpackage.txt
index 7c7bbbd..78f534e 100644
--- a/src/packaging/windows/jpackage.txt
+++ b/src/packaging/windows/jpackage.txt
@@ -1,12 +1,18 @@
 --type msi
---name "${app.name}"
+--name ${app.name}
+--app-version ${app.version}
+--win-menu
+--win-menu-group ${windows.vendor}
+--win-shortcut
 --vendor ${windows.vendor}
 --dest "${project.build.directory}/installer-${matrix.os}"
+
 --main-class ${main-class}
 --input "${project.build.directory}/dependency"
 --runtime-image "${project.build.directory}/jvm-image"
 --temp "${project.build.directory}/installer-work"
 --java-options "-XX:MaxRAMPercentage=75"
+
 --win-upgrade-uuid ${windows.upgrade.uuid}
 --description "${project.description}"
 --copyright "(C) ${windows.vendor}"

From f86c7de5a43ffa55e5671e52087b435fb85030c3 Mon Sep 17 00:00:00 2001
From: Caleb Hulbert <cmhulbert@gmail.com>
Date: Tue, 30 Jul 2024 14:44:44 -0400
Subject: [PATCH 2/2] ci: dep blosc on windows

---
 .github/workflows/build-installers.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml
index a0a1d76..fd5c832 100644
--- a/.github/workflows/build-installers.yml
+++ b/.github/workflows/build-installers.yml
@@ -43,6 +43,11 @@ jobs:
       - name: Add Wix to Path
         run: echo "$HOME/target/wix" >> $GITHUB_PATH
         if: matrix.os == 'windows-latest'
+      - name: Install blosc (Windows)
+        if: matrix.os == 'windows-latest'
+        run: |
+          pip install blosc --no-input --target src/test/resources
+          mv src/test/resources/bin/* src/test/resources
       - uses: actions/checkout@v2
       - name: Set up JDK
         uses: actions/setup-java@v2