From b133d0f16d33fa0f842263e40c783723c6a47408 Mon Sep 17 00:00:00 2001
From: "IETM_FIXE\\ietm6" <ietm64@igmlcreation.fr>
Date: Mon, 22 Jun 2026 09:49:33 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20dans=20l'installeur=20:=20ajout=20?=
 =?UTF-8?q?d'une=20case=20pour=20pouvoir=20lancer=20le=20programme=20autom?=
 =?UTF-8?q?atiquement=20=C3=A0=20la=20fin=20de=20l'installation=20(sous=20?=
 =?UTF-8?q?windows)=20afin=20d'=C3=A9viter=20que=20l'utilisateur=20ne=20so?=
 =?UTF-8?q?it=20perturb=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installers/desktop/build-windows.ps1 |   2 +
 installers/desktop/wix/main.wxs      | 164 +++++++++++++++++++++++++++
 2 files changed, 166 insertions(+)
 create mode 100644 installers/desktop/wix/main.wxs

diff --git a/installers/desktop/build-windows.ps1 b/installers/desktop/build-windows.ps1
index 8952491..e3cfd98 100644
--- a/installers/desktop/build-windows.ps1
+++ b/installers/desktop/build-windows.ps1
@@ -58,6 +58,7 @@ $CoreDir  = Join-Path $RepoRoot 'core'
 $StageDir = Join-Path $CoreDir 'target\dist-input'   # charge utile jpackage
 $OutDir   = Join-Path $CoreDir 'target\dist-out'     # .msi produit
 $IconFile = Join-Path $PSScriptRoot 'app-icon.ico'   # icone de l'app (.msi + raccourcis)
+$WixDir   = Join-Path $PSScriptRoot 'wix'            # main.wxs surcharge (case "Lancer" en fin d'install)
 
 # --- Version (numerique pour MSI) ------------------------------------------
 if (-not $Version) {
@@ -229,6 +230,7 @@ jpackage `
     --app-version $Version `
     --vendor 'IGML Creation' `
     --icon $IconFile `
+    --resource-dir $WixDir `
     --input $StageDir `
     --main-jar loremind-core.jar `
     --main-class org.springframework.boot.loader.launch.JarLauncher `
diff --git a/installers/desktop/wix/main.wxs b/installers/desktop/wix/main.wxs
new file mode 100644
index 0000000..5c391f4
--- /dev/null
+++ b/installers/desktop/wix/main.wxs
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  main.wxs SURCHARGE (option resource-dir de jpackage) : copie du template du
+  JDK 21, plus une case "Lancer DM Loremind" sur l'ecran de fin (ExitDialog).
+
+  A garder synchronise avec le template du JDK du build (JDK 21). Pour re-extraire
+  la base : jimage extract (include regex main.wxs) depuis $JAVA_HOME/lib/modules.
+  Les seuls ajouts maison sont marques [DM Loremind].
+
+  Lancement : installeur per-user, donc contexte utilisateur ; une custom action
+  Directory + ExeCommand suffit (pas besoin de WixUtilExtension).
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+  <?ifdef JpIsSystemWide ?>
+    <?define JpInstallScope="perMachine"?>
+  <?else?>
+    <?define JpInstallScope="perUser"?>
+  <?endif?>
+
+  <?define JpProductLanguage=1033 ?>
+  <?define JpInstallerVersion=200 ?>
+  <?define JpCompressedMsi=yes ?>
+
+  <?include $(var.JpConfigDir)/overrides.wxi ?>
+
+  <?ifdef JpAllowUpgrades ?>
+    <?define JpUpgradeVersionOnlyDetectUpgrade="no"?>
+  <?else?>
+    <?define JpUpgradeVersionOnlyDetectUpgrade="yes"?>
+  <?endif?>
+  <?ifdef JpAllowDowngrades ?>
+    <?define JpUpgradeVersionOnlyDetectDowngrade="no"?>
+  <?else?>
+    <?define JpUpgradeVersionOnlyDetectDowngrade="yes"?>
+  <?endif?>
+
+  <Product
+    Id="$(var.JpProductCode)"
+    Name="$(var.JpAppName)"
+    Language="$(var.JpProductLanguage)"
+    Version="$(var.JpAppVersion)"
+    Manufacturer="$(var.JpAppVendor)"
+    UpgradeCode="$(var.JpProductUpgradeCode)">
+
+    <Package
+      Description="$(var.JpAppDescription)"
+      Manufacturer="$(var.JpAppVendor)"
+      InstallerVersion="$(var.JpInstallerVersion)"
+      Compressed="$(var.JpCompressedMsi)"
+      InstallScope="$(var.JpInstallScope)" Platform="x64"
+    />
+
+    <Media Id="1" Cabinet="Data.cab" EmbedCab="yes" />
+
+    <Upgrade Id="$(var.JpProductUpgradeCode)">
+      <UpgradeVersion
+        OnlyDetect="$(var.JpUpgradeVersionOnlyDetectUpgrade)"
+        Property="JP_UPGRADABLE_FOUND"
+        Maximum="$(var.JpAppVersion)"
+        MigrateFeatures="yes"
+        IncludeMaximum="$(var.JpUpgradeVersionOnlyDetectUpgrade)" />
+      <UpgradeVersion
+        OnlyDetect="$(var.JpUpgradeVersionOnlyDetectDowngrade)"
+        Property="JP_DOWNGRADABLE_FOUND"
+        Minimum="$(var.JpAppVersion)"
+        MigrateFeatures="yes"
+        IncludeMinimum="$(var.JpUpgradeVersionOnlyDetectDowngrade)" />
+    </Upgrade>
+
+    <?ifndef JpAllowUpgrades ?>
+    <CustomAction Id="JpDisallowUpgrade" Error="!(loc.DisallowUpgradeErrorMessage)" />
+    <?endif?>
+    <?ifndef JpAllowDowngrades ?>
+    <CustomAction Id="JpDisallowDowngrade" Error="!(loc.DowngradeErrorMessage)" />
+    <?endif?>
+
+    <Binary Id="JpCaDll" SourceFile="wixhelper.dll"/>
+
+    <CustomAction Id="JpFindRelatedProducts" BinaryKey="JpCaDll" DllEntry="FindRelatedProductsEx" />
+
+    <!-- Standard required root -->
+    <Directory Id="TARGETDIR" Name="SourceDir"/>
+
+    <Feature Id="DefaultFeature" Title="!(loc.MainFeatureTitle)" Level="1">
+      <ComponentGroupRef Id="Shortcuts"/>
+      <ComponentGroupRef Id="Files"/>
+      <ComponentGroupRef Id="FileAssociations"/>
+    </Feature>
+
+    <CustomAction Id="JpSetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
+    <CustomAction Id="JpSetARPCOMMENTS" Property="ARPCOMMENTS" Value="$(var.JpAppDescription)" />
+    <CustomAction Id="JpSetARPCONTACT" Property="ARPCONTACT" Value="$(var.JpAppVendor)" />
+    <CustomAction Id="JpSetARPSIZE" Property="ARPSIZE" Value="$(var.JpAppSizeKb)" />
+
+    <?ifdef JpHelpURL ?>
+      <CustomAction Id="JpSetARPHELPLINK" Property="ARPHELPLINK" Value="$(var.JpHelpURL)" />
+    <?endif?>
+
+    <?ifdef JpAboutURL ?>
+      <CustomAction Id="JpSetARPURLINFOABOUT" Property="ARPURLINFOABOUT" Value="$(var.JpAboutURL)" />
+    <?endif?>
+
+    <?ifdef JpUpdateURL ?>
+      <CustomAction Id="JpSetARPURLUPDATEINFO" Property="ARPURLUPDATEINFO" Value="$(var.JpUpdateURL)" />
+    <?endif?>
+
+    <?ifdef JpIcon ?>
+    <Property Id="ARPPRODUCTICON" Value="JpARPPRODUCTICON"/>
+    <Icon Id="JpARPPRODUCTICON" SourceFile="$(var.JpIcon)"/>
+    <?endif?>
+
+    <UIRef Id="JpUI"/>
+
+    <!-- ===================== [DM Loremind] ===================== -->
+    <!-- Case « Lancer l'application » sur l'ExitDialog standard de WixUI.
+         WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT : libellé de la case (la rend visible).
+         WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 : cochée par défaut. -->
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Lancer $(var.JpAppName)" />
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" />
+    <!-- Lance le launcher jpackage ([INSTALLDIR]<AppName>.exe). asyncNoWait : on
+         n'attend pas la fin de l'app. Contexte utilisateur (install per-user). -->
+    <CustomAction Id="JpLaunchApplication"
+                  Directory="INSTALLDIR"
+                  ExeCommand="&quot;[INSTALLDIR]$(var.JpAppName).exe&quot;"
+                  Return="asyncNoWait"
+                  Impersonate="yes" />
+    <UI>
+      <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="JpLaunchApplication" Order="1">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+    </UI>
+    <!-- =================== fin [DM Loremind] =================== -->
+
+    <InstallExecuteSequence>
+      <Custom Action="JpSetARPINSTALLLOCATION" After="CostFinalize">Not Installed</Custom>
+      <Custom Action="JpSetARPCOMMENTS" After="CostFinalize">Not Installed</Custom>
+      <Custom Action="JpSetARPCONTACT" After="CostFinalize">Not Installed</Custom>
+      <Custom Action="JpSetARPSIZE" After="CostFinalize">Not Installed</Custom>
+      <?ifdef JpHelpURL ?>
+        <Custom Action="JpSetARPHELPLINK" After="CostFinalize">Not Installed</Custom>
+      <?endif?>
+      <?ifdef JpAboutURL ?>
+        <Custom Action="JpSetARPURLINFOABOUT" After="CostFinalize">Not Installed</Custom>
+      <?endif?>
+      <?ifdef JpUpdateURL ?>
+        <Custom Action="JpSetARPURLUPDATEINFO" After="CostFinalize">Not Installed</Custom>
+      <?endif?>
+
+      <?ifndef JpAllowUpgrades ?>
+      <Custom Action="JpDisallowUpgrade" After="JpFindRelatedProducts">JP_UPGRADABLE_FOUND</Custom>
+      <?endif?>
+      <?ifndef JpAllowDowngrades ?>
+      <Custom Action="JpDisallowDowngrade" After="JpFindRelatedProducts">JP_DOWNGRADABLE_FOUND</Custom>
+      <?endif?>
+      <RemoveExistingProducts Before="CostInitialize"/>
+      <Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
+    </InstallExecuteSequence>
+
+    <InstallUISequence>
+      <Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
+    </InstallUISequence>
+
+  </Product>
+</Wix>