#1087: Fix MSI Installation with setup.bat workaround (#1090)

devonfw · Feb 27, 2025 · 7fa23c7 · 7fa23c7
1 parent cc6e45c
commit 7fa23c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cli/pom.xml b/cli/pom.xml
@@ -276,7 +276,7 @@
                 <configuration>
                   <tasks>
                     <move file="${project.basedir}/target/msi/ideasy.msi"
-                      tofile="${project.basedir}/target/${project.artifactId}-${revision}.msi"/>
+                      tofile="${project.basedir}/target/${project.artifactId}-${revision}-windows-x64.msi"/>
                   </tasks>
                 </configuration>
               </execution>
@@ -294,7 +294,7 @@
                 <configuration>
                   <artifacts>
                     <artifact>
-                      <file>${project.basedir}/target/${project.artifactId}-${revision}.msi</file>
+                      <file>${project.basedir}/target/${project.artifactId}-${revision}-windows-x64.msi</file>
                       <type>msi</type>
                     </artifact>
                   </artifacts>

diff --git a/windows-installer/Package.wxs b/windows-installer/Package.wxs
@@ -36,7 +36,7 @@
 		<!-- Execution of install command-->
 		<SetProperty
 			Id="RunInstallAction"
-			Value="&quot;[%SystemFolder]cmd.exe&quot; /c &quot;[INSTALLFOLDER]bin\ideasy.exe -f install&quot;"
+			Value="&quot;[%SystemFolder]cmd.exe&quot; /c &quot;[INSTALLFOLDER]setup.bat -b&quot;"
 			Before="RunInstallAction"
 			Sequence="execute"
 			/>
@@ -52,7 +52,7 @@
     <!-- Execution of uninstall command-->
     <SetProperty
       Id="RunUninstallAction"
-			Value="&quot;[%SystemFolder]cmd.exe&quot; /c &quot;[INSTALLFOLDER]bin\ideasy.exe -f uninstall&quot;"
+			Value="&quot;[%SystemFolder]cmd.exe&quot; /c &quot;%IDE_ROOT%\_ide\installation\bin\ideasy.exe -f uninstall&quot;"
       Before="RunUninstallAction"
       Sequence="execute"
       />
@@ -62,7 +62,7 @@
       DllEntry="WixQuietExec"
       Execute="deferred"
       Impersonate="yes"
-      Return="check"
+      Return="ignore"
       />
 
 		<!-- Specifying when Custom Actions should run -->