#95: refactor installer files, removes installer-slim

rladstaetter · Oct 16, 2022 · 80b6f56 · 80b6f56
1 parent ef712f6
commit 80b6f56
Show file tree

Hide file tree

Showing 6 changed files with 201 additions and 1,256 deletions.
diff --git a/dist/dist-win/installer-win-jre/pom.xml b/dist/dist-win/installer-win-jre/pom.xml
@@ -11,8 +11,7 @@
 
     <artifactId>installer-win-jre</artifactId>
     <name>app.logorrr.dist.win-jre.installer</name>
-    <description>Installer project using Advanced Installer technology to install LogoRRR with its own dedicated jre
-    </description>
+    <description>Installer project using Advanced Installer technology to install LogoRRR with its own dedicated jre</description>
 
     <dependencies>
         <dependency>
@@ -57,17 +56,36 @@
                         <configuration>
                             <!-- important not to overwrite jar files because of name clashes (core.jar for example) -->
                             <prependGroupId>true</prependGroupId>
-                            <outputDirectory>${project.build.directory}/installer/binaries/</outputDirectory>
+                            <outputDirectory>${project.build.directory}/installer/programfiles/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.googlecode.maven-download-plugin</groupId>
+                <artifactId>download-maven-plugin</artifactId>
+                <version>1.6.8</version>
+                <executions>
+                    <execution>
+                        <id>fetch-jre</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>wget</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <url>https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jre_x64_windows_hotspot_19_36.zip</url>
+                    <unpack>true</unpack>
+                    <outputDirectory>${project.build.directory}/installer/</outputDirectory>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>create-product-code-logorrr-installer-jre</id>
+                        <id>process-product-code-logorrr-installer-jre</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>java</goal>
@@ -84,7 +102,7 @@
                     <!-- Create installer -->
                     <execution>
                         <id>create-installer-slim</id>
-                        <phase>package</phase>
+                        <phase>compile</phase>
                         <goals>
                             <goal>exec</goal>
                         </goals>