CI: Merge all packaging scripts to one directory

stenzek · Dec 1, 2024 · 42c5f91 · 42c5f91
1 parent c6746e7
commit 42c5f91
Show file tree

Hide file tree

Showing 21 changed files with 16 additions and 21 deletions.
diff --git a/.github/workflows/linux-appimage-build.yml b/.github/workflows/linux-appimage-build.yml
@@ -14,7 +14,7 @@ jobs:
         fetch-depth: 0
 
     - name: Install Packages
-      run: scripts/appimage/install-packages.sh      
+      run: scripts/packaging/appimage/install-packages.sh
 
     - name: Cache Dependencies
       id: cache-deps
@@ -66,7 +66,7 @@ jobs:
         cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" ..
         cmake --build . --parallel
         cd ..
-        scripts/appimage/make-appimage.sh $(realpath .) $(realpath ./build) $HOME/deps DuckStation-x64
+        scripts/packaging/appimage/make-appimage.sh $(realpath .) $(realpath ./build) $HOME/deps DuckStation-x64
 
     - name: Upload Qt AppImage
       uses: actions/upload-artifact@v4.3.3
@@ -85,7 +85,7 @@ jobs:
         fetch-depth: 0
 
     - name: Install Packages
-      run: scripts/appimage/install-packages.sh      
+      run: scripts/packaging/appimage/install-packages.sh
 
     - name: Cache Dependencies
       id: cache-deps
@@ -137,7 +137,7 @@ jobs:
         cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DDISABLE_SSE4=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" ..
         cmake --build . --parallel
         cd ..
-        scripts/appimage/make-appimage.sh $(realpath .) $(realpath ./build) $HOME/deps DuckStation-x64-SSE2
+        scripts/packaging/appimage/make-appimage.sh $(realpath .) $(realpath ./build) $HOME/deps DuckStation-x64-SSE2
 
     - name: Upload Qt AppImage
       uses: actions/upload-artifact@v4.3.3

diff --git a/.github/workflows/linux-flatpak-build.yml b/.github/workflows/linux-flatpak-build.yml
@@ -59,29 +59,29 @@ jobs:
 
     - name: Generate AppStream XML
       run: |
-        scripts/generate-metainfo.sh scripts/flatpak
-        cat scripts/flatpak/org.duckstation.DuckStation.metainfo.xml
+        scripts/packaging/generate-metainfo.sh scripts/packaging/flatpak
+        cat scripts/packaging/flatpak/org.duckstation.DuckStation.metainfo.xml
 
     - name: Validate AppStream XML
-      run: flatpak-builder-lint appstream scripts/flatpak/org.duckstation.DuckStation.metainfo.xml
+      run: flatpak-builder-lint appstream scripts/packaging/flatpak/org.duckstation.DuckStation.metainfo.xml
 
     - name: Validate Manifest
-      run: flatpak-builder-lint manifest scripts/flatpak/org.duckstation.DuckStation.yaml
+      run: flatpak-builder-lint manifest scripts/packaging/flatpak/org.duckstation.DuckStation.yaml
 
     - name: Build Flatpak
       uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
       with:
         bundle: duckstation-x64.flatpak
         upload-artifact: false
-        manifest-path: scripts/flatpak/org.duckstation.DuckStation.yaml
+        manifest-path: scripts/packaging/flatpak/org.duckstation.DuckStation.yaml
         arch: x86_64
         build-bundle: true
         verbose: true
         mirror-screenshots-url: https://dl.flathub.org/media
         branch: stable
         cache: true
         restore-cache: true
-        cache-key: flatpak-x64-${{ hashFiles('scripts/flatpak/**/*.yaml') }}
+        cache-key: flatpak-x64-${{ hashFiles('scripts/packaging/flatpak/**/*.yaml') }}
 
     - name: Validate Build
       run: |

diff --git a/scripts/clang-toolchain.cmake b/scripts/clang-toolchain.cmake
diff --git a/...s/appimage/apprun-hooks/default-to-x11.sh → ...g/appimage/apprun-hooks/default-to-x11.sh b/...s/appimage/apprun-hooks/default-to-x11.sh → ...g/appimage/apprun-hooks/default-to-x11.sh
diff --git a/scripts/appimage/install-packages.sh → ...ts/packaging/appimage/install-packages.sh b/scripts/appimage/install-packages.sh → ...ts/packaging/appimage/install-packages.sh
diff --git a/scripts/appimage/make-appimage.sh → scripts/packaging/appimage/make-appimage.sh b/scripts/appimage/make-appimage.sh → scripts/packaging/appimage/make-appimage.sh
@@ -127,8 +127,8 @@ DEPLOY_PLATFORM_THEMES="1" \
 QMAKE="$DEPSDIR/bin/qmake" \
 NO_STRIP="1" \
 $LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/duckstation-qt" ${EXTRA_LIBS_ARGS[@]} \
---desktop-file="$ROOTDIR/scripts/org.duckstation.DuckStation.desktop" \
---icon-file="$ROOTDIR/scripts/org.duckstation.DuckStation.png" \
+--desktop-file="$ROOTDIR/scripts/packaging/org.duckstation.DuckStation.desktop" \
+--icon-file="$ROOTDIR/scripts/packaging/org.duckstation.DuckStation.png" \
 
 echo "Copying resources into AppDir..."
 cp -a "$BUILDDIR/bin/resources" "$OUTDIR/usr/bin"

diff --git a/scripts/flatpak/.gitignore → scripts/packaging/flatpak/.gitignore b/scripts/flatpak/.gitignore → scripts/packaging/flatpak/.gitignore
diff --git a/scripts/flatpak/modules/10-libbacktrace.yaml → ...ging/flatpak/modules/10-libbacktrace.yaml b/scripts/flatpak/modules/10-libbacktrace.yaml → ...ging/flatpak/modules/10-libbacktrace.yaml
diff --git a/scripts/flatpak/modules/11-libzip.yaml → .../packaging/flatpak/modules/11-libzip.yaml b/scripts/flatpak/modules/11-libzip.yaml → .../packaging/flatpak/modules/11-libzip.yaml
diff --git a/scripts/flatpak/modules/20-sdl2.yaml → ...ts/packaging/flatpak/modules/20-sdl2.yaml b/scripts/flatpak/modules/20-sdl2.yaml → ...ts/packaging/flatpak/modules/20-sdl2.yaml
diff --git a/scripts/flatpak/modules/21-shaderc.yaml → ...packaging/flatpak/modules/21-shaderc.yaml b/scripts/flatpak/modules/21-shaderc.yaml → ...packaging/flatpak/modules/21-shaderc.yaml
diff --git a/scripts/flatpak/modules/22-spirv-cross.yaml → ...aging/flatpak/modules/22-spirv-cross.yaml b/scripts/flatpak/modules/22-spirv-cross.yaml → ...aging/flatpak/modules/22-spirv-cross.yaml
diff --git a/scripts/flatpak/modules/23-cpuinfo.yaml → ...packaging/flatpak/modules/23-cpuinfo.yaml b/scripts/flatpak/modules/23-cpuinfo.yaml → ...packaging/flatpak/modules/23-cpuinfo.yaml
diff --git a/scripts/flatpak/modules/24-discord-rpc.yaml → ...aging/flatpak/modules/24-discord-rpc.yaml b/scripts/flatpak/modules/24-discord-rpc.yaml → ...aging/flatpak/modules/24-discord-rpc.yaml
diff --git a/scripts/flatpak/modules/25-soundtouch.yaml → ...kaging/flatpak/modules/25-soundtouch.yaml b/scripts/flatpak/modules/25-soundtouch.yaml → ...kaging/flatpak/modules/25-soundtouch.yaml
diff --git a/scripts/flatpak/modules/26-lunasvg.yaml → ...packaging/flatpak/modules/26-lunasvg.yaml b/scripts/flatpak/modules/26-lunasvg.yaml → ...packaging/flatpak/modules/26-lunasvg.yaml
diff --git a/.../flatpak/org.duckstation.DuckStation.yaml → .../flatpak/org.duckstation.DuckStation.yaml b/.../flatpak/org.duckstation.DuckStation.yaml → .../flatpak/org.duckstation.DuckStation.yaml
@@ -80,21 +80,21 @@ modules:
         - "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-fuse-ld=lld"
     sources:
       - type: dir
-        path: ../..
+        path: ../../..
 
     post-install:
       # Manually copy desktop file/metadata, it's not done as part of the regular build.
       - >-
         install -Dm644
-        "${FLATPAK_BUILDER_BUILDDIR}/scripts/org.duckstation.DuckStation.png"
+        "${FLATPAK_BUILDER_BUILDDIR}/scripts/packaging/org.duckstation.DuckStation.png"
         "${FLATPAK_DEST}/share/icons/hicolor/512x512/apps/org.duckstation.DuckStation.png"
       - >-
         install -Dm644
-        "${FLATPAK_BUILDER_BUILDDIR}/scripts/org.duckstation.DuckStation.desktop"
+        "${FLATPAK_BUILDER_BUILDDIR}/scripts/packaging/org.duckstation.DuckStation.desktop"
         "${FLATPAK_DEST}/share/applications/org.duckstation.DuckStation.desktop"
       - >-
         install -Dm644
-        "${FLATPAK_BUILDER_BUILDDIR}/scripts/flatpak/org.duckstation.DuckStation.metainfo.xml"
+        "${FLATPAK_BUILDER_BUILDDIR}/scripts/packaging/flatpak/org.duckstation.DuckStation.metainfo.xml"
         "${FLATPAK_DEST}/share/metainfo/org.duckstation.DuckStation.metainfo.xml"
 
       # Ensure ffmpeg-full mount point exists.

diff --git a/scripts/generate-metainfo.sh → scripts/packaging/generate-metainfo.sh b/scripts/generate-metainfo.sh → scripts/packaging/generate-metainfo.sh
diff --git a/scripts/org.duckstation.DuckStation.desktop → ...aging/org.duckstation.DuckStation.desktop b/scripts/org.duckstation.DuckStation.desktop → ...aging/org.duckstation.DuckStation.desktop
diff --git a/...g.duckstation.DuckStation.metainfo.xml.in → ...g.duckstation.DuckStation.metainfo.xml.in b/...g.duckstation.DuckStation.metainfo.xml.in → ...g.duckstation.DuckStation.metainfo.xml.in
diff --git a/scripts/org.duckstation.DuckStation.png → ...packaging/org.duckstation.DuckStation.png b/scripts/org.duckstation.DuckStation.png → ...packaging/org.duckstation.DuckStation.png