FutureRestore GUI — v1.90

Merge pull request #47 from CoocooFroggy/dev
CoocooFroggy · Jul 23, 2021 · 60f5d26 · 60f5d26
2 parents 5ed78ba + b951c40
commit 60f5d26
Show file tree

Hide file tree

Showing 13 changed files with 2,615 additions and 957 deletions.
diff --git a/.github/workflows/build-pack-manual.yml b/.github/workflows/build-pack-manual.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-create-draft:
+  build-and-setup:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
@@ -45,7 +45,7 @@ jobs:
           path: version.txt
 
   ubuntu-pack:
-    needs: [ build-and-create-draft ]
+    needs: [ build-and-setup ]
     runs-on: ubuntu-latest
     steps:
 
@@ -106,7 +106,7 @@ jobs:
           path: FutureRestore-GUI-Linux-Universal.zip
 
   macos-pack:
-    needs: [ build-and-create-draft ]
+    needs: [ build-and-setup ]
     runs-on: macos-latest
     steps:
 
@@ -118,6 +118,9 @@ jobs:
         with:
           java-version: 15
 
+      - name: Install create-dmg
+        run: brew install create-dmg
+
       - name: Download final jar
         uses: actions/download-artifact@v2
         with:
@@ -141,19 +144,28 @@ jobs:
         run: |
           jpackage --input ./input --main-jar "FutureRestore GUI-1.0-all.jar" --main-class Main --type app-image --icon ./.github/workflows/mac/FutureRestoreGUIIcons.icns --copyright "© CoocooFroggy 2021" --verbose --mac-package-identifier com.coocoofroggy.futurerestoregui --name "FutureRestore GUI" --module-path ./.github/workflows/mac/javafx-jmods-11.0.2 --add-modules javafx.swing,java.logging,java.sql,java.base,jdk.crypto.ec,java.naming --app-version $VERSION
           codesign --remove-signature FutureRestore\ GUI.app
+          mkdir dmg-input
+          mv "FutureRestore GUI.app" dmg-input
+
+#      - name: Debug with ssh
+#        uses: lhotari/action-upterm@v1
+
+      - name: Create DMG from .app
+        run: |
+          create-dmg --hdiutil-quiet --volname "FutureRestore GUI Installer" --volicon ".github/workflows/mac/DMG Images/FRGUI-Drive-Icon.icns" --background ".github/workflows/mac/DMG Images/DMG-Background.png" --window-pos 200 120 --window-size 600 342 --icon-size 100 --icon "FutureRestore GUI.app" 80 200 --hide-extension "FutureRestore GUI.app" --app-drop-link 450 200 "FutureRestore GUI Installer.dmg" "dmg-input/"
 
-      - name: Zip .app
-        id: zip_app
-        run: zip -r FutureRestore-GUI-Mac.zip "FutureRestore GUI.app"
+#      - name: Zip .app
+#        id: zip_app
+#        run: zip -r FutureRestore-GUI-Mac.zip "FutureRestore GUI.app"
 
       - name: Upload Mac release
         uses: actions/upload-artifact@v2
         with:
-          name: FutureRestore-GUI-Mac-${{ steps.output-version.outputs.version }}.zip
-          path: FutureRestore-GUI-Mac.zip
+          name: FutureRestore-GUI-Mac-${{ steps.output-version.outputs.version }}.dmg
+          path: FutureRestore GUI Installer.dmg
 
   windows-pack:
-    needs: [ build-and-create-draft ]
+    needs: [ build-and-setup ]
     runs-on: windows-latest
     steps:
 

diff --git a/.github/workflows/build-pack-release.yml b/.github/workflows/build-pack-release.yml
@@ -174,6 +174,9 @@ jobs:
         with:
           java-version: 15
 
+      - name: Install create-dmg
+        run: brew install create-dmg
+
       - name: Download final jar
         uses: actions/download-artifact@v2
         with:
@@ -197,10 +200,16 @@ jobs:
         run: |
           jpackage --input ./input --main-jar "FutureRestore GUI-1.0-all.jar" --main-class Main --type app-image --icon ./.github/workflows/mac/FutureRestoreGUIIcons.icns --copyright "© CoocooFroggy 2021" --verbose --mac-package-identifier com.coocoofroggy.futurerestoregui --name "FutureRestore GUI" --module-path ./.github/workflows/mac/javafx-jmods-11.0.2 --add-modules javafx.swing,java.logging,java.sql,java.base,jdk.crypto.ec,java.naming --app-version $VERSION
           codesign --remove-signature FutureRestore\ GUI.app
+          mkdir dmg-input
+          mv "FutureRestore GUI.app" dmg-input
+
+      - name: Create DMG from .app
+        run: |
+          create-dmg --hdiutil-quiet --volname "FutureRestore GUI Installer" --volicon "/.github/workflows/mac/DMG Images/FRGUI-Drive-Icon.icns" --background "/.github/workflows/mac/DMG Images/DMG-Background.png" --window-pos 200 120 --window-size 600 342 --icon-size 100 --icon "FutureRestore GUI.app" 80 200 --hide-extension "FutureRestore GUI.app" --app-drop-link 450 200 "FutureRestore GUI Installer.dmg" "dmg-input/"
 
-      - name: Zip .app
-        id: zip_app
-        run: zip -r FutureRestore-GUI-Mac.zip "FutureRestore GUI.app"
+#      - name: Zip .app
+#        id: zip_app
+#        run: zip -r FutureRestore-GUI-Mac.zip "FutureRestore GUI.app"
 
       - name: Download URL to upload to
         uses: actions/download-artifact@v2
@@ -220,9 +229,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.set_upload_url.outputs.upload-url }}
-          asset_path: FutureRestore-GUI-Mac.zip
-          asset_name: FutureRestore-GUI-Mac-${{ steps.output-version.outputs.version }}.zip
-          asset_content_type: application/zip
+          asset_path: FutureRestore GUI Installer.dmg
+          asset_name: FutureRestore-GUI-Mac-${{ steps.output-version.outputs.version }}.dmg
+          asset_content_type: application/octet-stream
 
   windows-pack:
     needs: [ build-and-create-draft ]

diff --git a/.github/workflows/mac/DMG Images/DMG-Background.png b/.github/workflows/mac/DMG Images/DMG-Background.png
diff --git a/.github/workflows/mac/DMG Images/FRGUI-Drive-Icon.icns b/.github/workflows/mac/DMG Images/FRGUI-Drive-Icon.icns
diff --git a/build.gradle b/build.gradle
@@ -34,6 +34,7 @@ dependencies {
     implementation 'com.github.Dansoftowner:jSystemThemeDetector:3.6'
     implementation 'com.github.oshi:oshi-core:5.6.1'
     implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
+    implementation 'com.github.rjeschke:txtmark:0.13'
 }
 
 test {