Merge pull request #31 from xpdota/launcher-move

Launcher move
xpdota · Mar 6, 2022 · 9223635 · 9223635
2 parents f3099a2 + 3ed7bef
commit 9223635
Show file tree

Hide file tree

Showing 12 changed files with 914 additions and 125 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -26,14 +26,20 @@ jobs:
       run: xvfb-run mvn -T5 clean install
     - name: Copy release files
       run: |
-        pushd launcher/target/windows/deps/
-        md5sum *.jar > manifest
+        pushd launcher/target/windows/
+        mkdir -p updater_data/v2
+        md5sum *.exe deps/*.jar > updater_data/v2/manifest
+        cp -r *.exe deps/ updater_data/v2/
+        # Legacy updater
+        cd deps
+        md5sum *.jar > ../updater_data/manifest
+        cp *.jar ../updater_data/
         popd
     - name: Deploy release files
       uses: JamesIves/github-pages-deploy-action@4.1.7
 
       with:
-        folder: ./launcher/target/windows/deps
+        folder: ./launcher/target/windows/updater_data
         branch: gh-pages
         target-folder: ${{ github.ref_name }}
 

diff --git a/launcher/pom.xml b/launcher/pom.xml
@@ -15,6 +15,9 @@
         <mainClass>gg.xp.xivsupport.gui.GuiLaunch</mainClass>
         <mainImportClass>gg.xp.xivsupport.gui.GuiImportLaunch</mainImportClass>
         <mainUpdateClass>gg.xp.xivsupport.gui.Update</mainUpdateClass>
+        <launcherJar>./launcher-${project.version}.jar</launcherJar>
+        <launcherJarRelativeToPom>./target/windows/launcher-${project.version}.jar</launcherJarRelativeToPom>
+        <preCp>./userdata;./preload/*.jar;./deps/*.jar;./user/*.jar;${launcherJar}</preCp>
     </properties>
     <build>
         <plugins>
@@ -93,6 +96,23 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-jar-secondary</id>
+                        <!-- here the phase you need -->
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/windows/deps</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.build.directory}</directory>
+                                    <includes>launcher-${project.version}.jar</includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>copy-jre</id>
                         <!-- here the phase you need -->
@@ -146,8 +166,9 @@
                             <classPath>
                                 <mainClass>${mainImportClass}</mainClass>
                                 <addDependencies>false</addDependencies>
-                                <postCp>./preload/*.jar;./deps/*.jar;./user/*.jar</postCp>
+                                <preCp>${preCp}</preCp>
                             </classPath>
+                            <jar>./nonexistent.jar</jar>
                         </configuration>
                     </execution>
                     <execution>
@@ -165,8 +186,9 @@
                             <classPath>
                                 <mainClass>${mainClass}</mainClass>
                                 <addDependencies>false</addDependencies>
-                                <postCp>./preload/*.jar;./deps/*.jar;./user/*.jar</postCp>
+                                <preCp>${preCp}</preCp>
                             </classPath>
+                            <jar>./nonexistent.jar</jar>
                         </configuration>
                     </execution>
                     <execution>
@@ -181,6 +203,8 @@
                                 <mainClass>${mainUpdateClass}</mainClass>
                                 <addDependencies>false</addDependencies>
                             </classPath>
+                            <jar>${launcherJarRelativeToPom}</jar>
+                            <dontWrapJar>false</dontWrapJar>
                         </configuration>
                     </execution>
 
@@ -193,7 +217,6 @@
                         <opts><opt>@args.txt</opt></opts>
                     </jre>
                     <headerType>gui</headerType>
-                    <jar>./launcher-${project.version}.jar</jar>
                     <errTitle>Triggevent</errTitle>
                     <dontWrapJar>true</dontWrapJar>
                     <chdir>.</chdir>