From 3563ed3394b88ae1df2cb6809db40027c6d6f252 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 22 Jul 2021 14:09:06 +0200 Subject: [PATCH] restructured dist/ dir --- .github/workflows/build.yml | 17 +++++++---------- dist/{ => linux}/appimage/.gitignore | 0 dist/{ => linux}/appimage/build.sh | 0 .../resources/AppDir/bin/cryptomator.sh | 0 .../org.cryptomator.Cryptomator.desktop | 0 .../apps/org.cryptomator.Cryptomator.png | Bin .../apps/org.cryptomator.Cryptomator.png | Bin .../apps/org.cryptomator.Cryptomator.svg | 0 .../org.cryptomator.Cryptomator.appdata.xml | 0 .../launcher-linux.sh => linux/launcher.sh} | 0 .../linux/resources/Cryptomator.png | Bin dist/{appdir => }/mac/Cryptomator.entitlements | 0 .../launcher-mac.sh => mac/launcher.sh} | 0 .../mac/resources/Cryptomator-Vault.icns | Bin .../mac/resources/Cryptomator.icns | Bin dist/{appdir => }/mac/resources/Info.plist | 0 dist/{appdir => }/win/contrib/dokan1.dll | Bin dist/{appdir => }/win/contrib/jnidispatch.dll | Bin .../launcher-win.bat => win/launcher.bat} | 0 .../{appdir => }/win/resources/Cryptomator.ico | Bin 20 files changed, 7 insertions(+), 10 deletions(-) rename dist/{ => linux}/appimage/.gitignore (100%) rename dist/{ => linux}/appimage/build.sh (100%) rename dist/{ => linux}/appimage/resources/AppDir/bin/cryptomator.sh (100%) rename dist/{ => linux}/appimage/resources/AppDir/usr/share/applications/org.cryptomator.Cryptomator.desktop (100%) rename dist/{ => linux}/appimage/resources/AppDir/usr/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png (100%) rename dist/{ => linux}/appimage/resources/AppDir/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png (100%) rename dist/{ => linux}/appimage/resources/AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg (100%) rename dist/{ => linux}/appimage/resources/AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.appdata.xml (100%) rename dist/{buildkit/launcher-linux.sh => linux/launcher.sh} (100%) rename dist/{appdir => }/linux/resources/Cryptomator.png (100%) rename dist/{appdir => }/mac/Cryptomator.entitlements (100%) rename dist/{buildkit/launcher-mac.sh => mac/launcher.sh} (100%) rename dist/{appdir => }/mac/resources/Cryptomator-Vault.icns (100%) rename dist/{appdir => }/mac/resources/Cryptomator.icns (100%) rename dist/{appdir => }/mac/resources/Info.plist (100%) rename dist/{appdir => }/win/contrib/dokan1.dll (100%) rename dist/{appdir => }/win/contrib/jnidispatch.dll (100%) rename dist/{buildkit/launcher-win.bat => win/launcher.bat} (100%) rename dist/{appdir => }/win/resources/Cryptomator.ico (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4beb38fb2..1668483d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,13 +52,10 @@ jobs: include: - os: ubuntu-latest profile: linux - launcher: launcher-linux.sh - os: windows-latest profile: win - launcher: launcher-win.bat - os: macos-latest profile: mac - launcher: launcher-mac.sh steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 @@ -75,7 +72,7 @@ jobs: - name: Archive buildkit-${{ matrix.profile }}.tar.gz run: | cp LICENSE.txt target - cp dist/buildkit/${{ matrix.launcher }} target + cp dist/${{ matrix.profile }}/launcher* target cp target/cryptomator-*.jar target/mods - name: Upload buildkit-${{ matrix.profile }} uses: actions/upload-artifact@v2 @@ -137,7 +134,7 @@ jobs: --java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\"" --java-options "-Dcryptomator.showTrayIcon=false" --java-options "-Dcryptomator.buildNumber=\"appimage-${{ needs.metadata.outputs.revNum }}\"" - --resource-dir dist/appdir/linux/resources + --resource-dir dist/linux/resources - os: windows-latest profile: win jpackageoptions: > @@ -150,8 +147,8 @@ jobs: --java-options "-Dcryptomator.mountPointsDir=\"~/Cryptomator\"" --java-options "-Dcryptomator.showTrayIcon=true" --java-options "-Dcryptomator.buildNumber=\"msi-${{ needs.metadata.outputs.revNum }}\"" - --resource-dir dist/appdir/win/resources - --icon dist/appdir/win/resources/Cryptomator.ico + --resource-dir dist/win/resources + --icon dist/win/resources/Cryptomator.ico - os: macos-latest profile: mac jpackageoptions: > @@ -163,7 +160,7 @@ jobs: --java-options "-Dcryptomator.showTrayIcon=true" --java-options "-Dcryptomator.buildNumber=\"dmg-${{ needs.metadata.outputs.revNum }}\"" --mac-package-identifier org.cryptomator - --resource-dir dist/appdir/mac/resources + --resource-dir dist/mac/resources steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 @@ -237,8 +234,8 @@ jobs: - name: Patch Cryptomator.AppDir run: | mv appdir/Cryptomator Cryptomator.AppDir - cp -r dist/appimage/resources/AppDir/* Cryptomator.AppDir/ - envsubst '${REVISION_NO}' < dist/appimage/resources/AppDir/bin/cryptomator.sh > Cryptomator.AppDir/bin/cryptomator.sh + cp -r dist/linux/appimage/resources/AppDir/* Cryptomator.AppDir/ + envsubst '${REVISION_NO}' < dist/linux/appimage/resources/AppDir/bin/cryptomator.sh > Cryptomator.AppDir/bin/cryptomator.sh ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.svg ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/Cryptomator.svg ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/.DirIcon diff --git a/dist/appimage/.gitignore b/dist/linux/appimage/.gitignore similarity index 100% rename from dist/appimage/.gitignore rename to dist/linux/appimage/.gitignore diff --git a/dist/appimage/build.sh b/dist/linux/appimage/build.sh similarity index 100% rename from dist/appimage/build.sh rename to dist/linux/appimage/build.sh diff --git a/dist/appimage/resources/AppDir/bin/cryptomator.sh b/dist/linux/appimage/resources/AppDir/bin/cryptomator.sh similarity index 100% rename from dist/appimage/resources/AppDir/bin/cryptomator.sh rename to dist/linux/appimage/resources/AppDir/bin/cryptomator.sh diff --git a/dist/appimage/resources/AppDir/usr/share/applications/org.cryptomator.Cryptomator.desktop b/dist/linux/appimage/resources/AppDir/usr/share/applications/org.cryptomator.Cryptomator.desktop similarity index 100% rename from dist/appimage/resources/AppDir/usr/share/applications/org.cryptomator.Cryptomator.desktop rename to dist/linux/appimage/resources/AppDir/usr/share/applications/org.cryptomator.Cryptomator.desktop diff --git a/dist/appimage/resources/AppDir/usr/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png b/dist/linux/appimage/resources/AppDir/usr/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png similarity index 100% rename from dist/appimage/resources/AppDir/usr/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png rename to dist/linux/appimage/resources/AppDir/usr/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png diff --git a/dist/appimage/resources/AppDir/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png b/dist/linux/appimage/resources/AppDir/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png similarity index 100% rename from dist/appimage/resources/AppDir/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png rename to dist/linux/appimage/resources/AppDir/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png diff --git a/dist/appimage/resources/AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg b/dist/linux/appimage/resources/AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg similarity index 100% rename from dist/appimage/resources/AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg rename to dist/linux/appimage/resources/AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg diff --git a/dist/appimage/resources/AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.appdata.xml b/dist/linux/appimage/resources/AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.appdata.xml similarity index 100% rename from dist/appimage/resources/AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.appdata.xml rename to dist/linux/appimage/resources/AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.appdata.xml diff --git a/dist/buildkit/launcher-linux.sh b/dist/linux/launcher.sh similarity index 100% rename from dist/buildkit/launcher-linux.sh rename to dist/linux/launcher.sh diff --git a/dist/appdir/linux/resources/Cryptomator.png b/dist/linux/resources/Cryptomator.png similarity index 100% rename from dist/appdir/linux/resources/Cryptomator.png rename to dist/linux/resources/Cryptomator.png diff --git a/dist/appdir/mac/Cryptomator.entitlements b/dist/mac/Cryptomator.entitlements similarity index 100% rename from dist/appdir/mac/Cryptomator.entitlements rename to dist/mac/Cryptomator.entitlements diff --git a/dist/buildkit/launcher-mac.sh b/dist/mac/launcher.sh similarity index 100% rename from dist/buildkit/launcher-mac.sh rename to dist/mac/launcher.sh diff --git a/dist/appdir/mac/resources/Cryptomator-Vault.icns b/dist/mac/resources/Cryptomator-Vault.icns similarity index 100% rename from dist/appdir/mac/resources/Cryptomator-Vault.icns rename to dist/mac/resources/Cryptomator-Vault.icns diff --git a/dist/appdir/mac/resources/Cryptomator.icns b/dist/mac/resources/Cryptomator.icns similarity index 100% rename from dist/appdir/mac/resources/Cryptomator.icns rename to dist/mac/resources/Cryptomator.icns diff --git a/dist/appdir/mac/resources/Info.plist b/dist/mac/resources/Info.plist similarity index 100% rename from dist/appdir/mac/resources/Info.plist rename to dist/mac/resources/Info.plist diff --git a/dist/appdir/win/contrib/dokan1.dll b/dist/win/contrib/dokan1.dll similarity index 100% rename from dist/appdir/win/contrib/dokan1.dll rename to dist/win/contrib/dokan1.dll diff --git a/dist/appdir/win/contrib/jnidispatch.dll b/dist/win/contrib/jnidispatch.dll similarity index 100% rename from dist/appdir/win/contrib/jnidispatch.dll rename to dist/win/contrib/jnidispatch.dll diff --git a/dist/buildkit/launcher-win.bat b/dist/win/launcher.bat similarity index 100% rename from dist/buildkit/launcher-win.bat rename to dist/win/launcher.bat diff --git a/dist/appdir/win/resources/Cryptomator.ico b/dist/win/resources/Cryptomator.ico similarity index 100% rename from dist/appdir/win/resources/Cryptomator.ico rename to dist/win/resources/Cryptomator.ico