feat(build): build Windows .msi bundle

Author: skylot

.github/workflows/build-artifacts.yml

@@ -2,7 +2,7 @@ name: Build Artifacts
 
 on:
   push:
-    branches: [ master, build-test ]
+    branches: [ master, build-test, build-artifacts ]
 
 jobs:
   build:
@@ -88,6 +88,31 @@ jobs:
           retention-days: 14
           archive: false
 
+      # Prepare build for 'msi' bundle
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Install WiX Toolset
+        run: dotnet tool install wix --global --version 3.14.1
+
+      - name: Verify WiX
+        run: wix.exe --version
+
+      - name: Build msi
+        run: ./gradlew :jadx-gui:jpackage
+
+      - name: Save msi artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ format('jadx-gui-{0}.msi', env.JADX_VERSION) }}
+          path: jadx-gui/build/jpackage/jadx-gui-*.msi
+          if-no-files-found: error
+          retention-days: 14
+          # nightly.link support only '.zip' artifacts, issue: https://github.com/oprypin/nightly.link/issues/88
+          # archive: false
+
   build-mac-bundle:
     strategy:
       matrix:

.github/workflows/release.yml

@@ -20,6 +20,7 @@ jobs:
         with:
           release: 25
 
+
       - name: Set jadx version
         uses: actions/github-script@v9
         with:
@@ -41,6 +42,29 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
+      # Prepare build for 'msi' bundle
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Install WiX Toolset
+        run: dotnet tool install wix --global --version 3.14.1
+
+      - name: Verify WiX
+        run: wix.exe --version
+
+      - name: Build msi
+        run: ./gradlew :jadx-gui:jpackage
+
+      - name: Save msi artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ format('jadx-gui-{0}.msi', env.JADX_VERSION) }}
+          path: jadx-gui/build/jpackage/jadx-gui-*.msi
+          if-no-files-found: error
+          retention-days: 1
+
   build-release-mac-bundle:
     strategy:
       matrix:

jadx-gui/build.gradle.kts

@@ -148,7 +148,7 @@ launch4j {
 	mainClassName.set(application.mainClass.get())
 	copyConfigurable.set(listOf<Any>())
 	dontWrapJar.set(true)
-	icon.set("$projectDir/src/main/resources/logos/jadx-logo.ico")
+	icon.set("$projectDir/dist/windows/jadx-logo.ico")
 	outfile.set("jadx-gui-$jadxVersion.exe")
 	version.set(jadxVersion)
 	copyright.set("Skylot")
@@ -191,7 +191,8 @@ runtime {
 		"jdk.accessibility",
 	)
 	jpackage {
-		if (DefaultNativePlatform.getCurrentOperatingSystem().isMacOsX) {
+		val os = DefaultNativePlatform.getCurrentOperatingSystem()
+		if (os.isMacOsX) {
 			imageName = "jadx-gui"
 			val fileAssociations =
 				fileTree("$projectDir/dist/macos/jpackage-file-associations") { include("*.properties") }
@@ -210,10 +211,25 @@ runtime {
 			installerType = "dmg"
 			installerName = "jadx-gui"
 			skipInstaller = false
+		} else if (os.isWindows) {
+			// WiX Toolset required, install using: winget install WixToolset.WixToolset
+			appVersion = if (jadxVersion.matches(Regex("\\d+(\\.\\d+){0,2}"))) jadxVersion else "0.0.1"
+			imageOptions = listOf("--icon", "$projectDir/dist/windows/jadx-logo.ico")
+			skipInstaller = false
+			installerType = "msi"
+			installerOptions =
+				listOf(
+					"--win-menu",
+					"--win-shortcut",
+					"--win-dir-chooser",
+					"--win-upgrade-uuid",
+					"3d479468-383f-49fc-b374-53f64559dd9b",
+				)
+		} else if (os.isLinux) {
+			appVersion = if (jadxVersion.matches(Regex("\\d+(\\.\\d+){0,2}"))) jadxVersion else "0.0.1"
+			// TODO: setup linux packages, need to include jadx cli
 		} else {
-			imageOptions = listOf("--icon", "$projectDir/src/main/resources/logos/jadx-logo.ico")
-			skipInstaller = true
-			targetPlatformName = "win"
+			throw RuntimeException("Unexpected OS: " + os)
 		}
 	}
 	launcher {