Integrate jpackage into package phase (#10)

Closes #9
liturner · Jan 7, 2023 · 5bac9e8 · 5bac9e8
1 parent b065fcc
commit 5bac9e8
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,9 +19,6 @@ jobs:
     - name: Maven package
       run: mvn -B package --no-transfer-progress --file pom.xml
 
-    - name: JPackage
-      run: fred-jpackage/package.cmd
-
     - name: Publish build
       uses: actions/upload-artifact@v3
       with:

diff --git a/EULA.txt → fred-jpackage/EULA.txt b/EULA.txt → fred-jpackage/EULA.txt
diff --git a/fred-jpackage/package.cmd b/fred-jpackage/package.cmd
diff --git a/fred-jpackage/pom.xml b/fred-jpackage/pom.xml
@@ -21,7 +21,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
+                        <phase>prepare-package</phase>
                         <goals>
                             <goal>copy-dependencies</goal>
                         </goals>
@@ -31,6 +31,41 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>jpackage</executable>
+                    <arguments>
+                        <argument>-n</argument>
+                        <argument>Frederick</argument>
+                        <argument>-i</argument>
+                        <argument>target/dependency</argument>
+                        <argument>--main-class</argument>
+                        <argument>de.turnertech.frederick.main.Application</argument>
+                        <argument>--main-jar</argument>
+                        <argument>fred-main-${project.version}.jar</argument>
+                        <argument>-d</argument>
+                        <argument>target</argument>
+                        <argument>--vendor</argument>
+                        <argument>TurnerTech</argument>
+                        <argument>--icon</argument>
+                        <argument>frederick-logo.ico</argument>
+                        <argument>--license-file</argument>
+                        <argument>EULA.txt</argument>
+                        <argument>--win-shortcut</argument>
+                        <argument>--win-menu</argument>
+                    </arguments>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/pom.xml b/pom.xml
@@ -164,6 +164,11 @@
           <artifactId>maven-gpg-plugin</artifactId>
           <version>1.5</version>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
 
         <!-- Test Plugins -->
         <plugin>