packaging update

Author: p0358

.github/workflows/cmake.yml

@@ -110,3 +110,13 @@ jobs:
           build/package/
           UnCSO2-*.7z
           UnCSO2-*.AppImage
+
+    - name: Install
+      run: DESTDIR="build/install/" cmake --install build
+
+    - name: Upload install artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: install-${{ matrix.c_compiler }}-${{ matrix.os }}
+        path: |
+          build/install/

.github/workflows/flatpak.yml

@@ -18,25 +18,32 @@ jobs:
       # Don't fail the whole workflow if one architecture fails
       fail-fast: false
     steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: 'recursive'
-    - name: Install deps
-      if: ${{ matrix.arch != 'x86_64' }}
-      run: |
-        # Use the static binaries because it's unable to use a package manager 
-        curl https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz --output ./docker.tgz
-        tar xzvf docker.tgz
-        mv docker/* /usr/bin
-    - name: Set up QEMU
-      if: ${{ matrix.arch != 'x86_64' }}
-      id: qemu
-      uses: docker/setup-qemu-action@v3
-      with:
-        platforms: arm64
-    - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-      with:
-        bundle: UnCSO2.flatpak
-        manifest-path: tf.harmony.UnCSO2.yml
-        cache-key: flatpak-builder-${{ matrix.arch }}-${{ github.sha }}
-        arch: ${{ matrix.arch }}
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+
+      - name: Set output
+        id: read_version
+        run: echo "version=$(cat version.txt)" >> $GITHUB_OUTPUT
+
+      - name: Install deps
+        if: ${{ matrix.arch != 'x86_64' }}
+        run: |
+          # Use the static binaries because it's unable to use a package manager 
+          curl https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz --output ./docker.tgz
+          tar xzvf docker.tgz
+          mv docker/* /usr/bin
+
+      - name: Set up QEMU
+        if: ${{ matrix.arch != 'x86_64' }}
+        id: qemu
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
+
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        with:
+          bundle: UnCSO2-${{ steps.read_version.outputs.version }}-linux-${{ matrix.arch }}.flatpak
+          manifest-path: tf.harmony.UnCSO2.yml
+          cache-key: flatpak-builder-${{ matrix.arch }}-${{ github.sha }}
+          arch: ${{ matrix.arch }}

.gitignore

@@ -406,12 +406,19 @@ CMakeLists.txt.user*
 # CMake build directory
 /build
 
-# appimage executables
+# AppImage executables
 *.AppImage
 
 /CMakeUserPresets.json
 
+# Flatpak
 /.flatpak-builder
 /repo
 /builddir
 *.flatpak
+
+# Arch Linux
+/.SRCINFO
+/src
+/pkg
+*.tar.zst

CMakeLists.txt

@@ -243,3 +243,14 @@ target_link_libraries(uc2 uncso2)
 
 # link Qt6
 target_link_libraries(uc2 Qt::Widgets)
+
+#
+# Installation rules
+#
+
+install(TARGETS uc2 DESTINATION bin)
+
+install(FILES tf.harmony.UnCSO2.desktop DESTINATION share/applications)
+install(FILES tf.harmony.UnCSO2.svg DESTINATION share/icons/hicolor/scalable/apps)
+install(FILES tf.harmony.UnCSO2.metainfo.xml DESTINATION share/metainfo)
+#install(FILES tf.harmony.UnCSO2-mime.xml DESTINATION share/mime/packages)

PKGBUILD

@@ -0,0 +1,38 @@
+pkgname=uncso2
+pkgver=2.1.1
+pkgrel=1
+pkgdesc='Extract Counter-Strike: Online 2 and Titanfall Online game files'
+arch=(any)
+url="https://github.com/harmonytf/UnCSO2"
+license=(GPL-3.0-only)
+depends=(libuncso2)
+makedepends=(cmake)
+source=()
+_sourcedir="UnCSO2"
+
+prepare() {
+	ln -snf "$startdir" "$srcdir"
+}
+
+build() {
+	cmake -B build -S "$_sourcedir" \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -Wno-dev
+    cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+	install -Dm644 "$_sourcedir/COPYING" -t "$pkgdir/usr/share/licenses/$pkgname"
+
+	rm -rf "$pkgdir/usr/bin/cryptest"
+	rm -rf "$pkgdir/usr/include"
+	rm -rf "$pkgdir/usr/lib/libcryptopp.a"
+	rm -rf "$pkgdir/usr/share/cmake"
+	rm -rf "$pkgdir/usr/share/cryptopp"
+	rm -rf "$pkgdir/usr/share/pkgconfig/cryptopp.pc"
+
+	# those belong to libuncso2 package
+	rm -rf "$pkgdir/usr/lib"
+}

README.md

@@ -95,6 +95,35 @@ cmake -G "Ninja" \
 ninja all
 ```
 
+#### Flatpak build
+
+```sh
+flatpak run --command=flathub-build org.flatpak.Builder --install tf.harmony.UnCSO2.yml
+```
+
+Lint:
+
+```sh
+flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest tf.harmony.UnCSO2.yml
+flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo
+```
+
+Single-file bundle (for sharing a dev build):
+
+```sh
+flatpak build-bundle repo UnCSO2.flatpak tf.harmony.UnCSO2 --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
+```
+
+More information: <https://docs.flatpak.org/en/latest/first-build.html>
+
+#### Arch Linux build
+
+Assuming you cloned to a dir named `UnCSO2`...
+
+```sh
+paru -Bi .
+```
+
 ## Libraries used
 
 UnCSO2 uses the following libraries:

libuncso2

@@ -20,18 +20,10 @@ modules:
       - /share/cryptopp
       - /include
       - /bin/cryptest
-      - /lib/debug/source
       - '*.a'
     sources:
       - type: dir
         path: .
       #- type: git
       #  url: https://github.com/harmonytf/UnCSO2.git
       #  commit: 34f1d268b5baf0ff983670b33e2f39cec6aa99ab
-    post-install:
-      - install -Dm644 ${FLATPAK_ID}.metainfo.xml ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.metainfo.xml
-      - install -Dm644 ${FLATPAK_ID}.desktop ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop
-      - install -Dm644 ${FLATPAK_ID}.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg
-      #- install -Dm644 ${FLATPAK_ID}-mime.xml ${FLATPAK_DEST}/share/mime/packages/${FLATPAK_ID}-mime.xml
-      - install -Dm755 uncso2 ${FLATPAK_DEST}/bin/uncso2
-      - install -Dm755 libuncso2/libuncso2.so* -t ${FLATPAK_DEST}/lib/