- Fix incorrectly generated flatpak

This commit is contained in:
Ilya 2023-04-01 02:41:24 +06:00 committed by SoapyMan
parent 92822bc52a
commit 4ae670dcf8
5 changed files with 18 additions and 18 deletions

View File

@ -1,21 +1,22 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
# Creating flatpak directories # Configure
mkdir -p "${APPVEYOR_BUILD_FOLDER}/.flatpak/lib" "${APPVEYOR_BUILD_FOLDER}/.flatpak/data" "${APPVEYOR_BUILD_FOLDER}/.flatpak/bin"
cd "$APPVEYOR_BUILD_FOLDER/src_rebuild" cd "$APPVEYOR_BUILD_FOLDER/src_rebuild"
./premake5 gmake2 ./premake5 gmake2
cd project_gmake2_linux cd project_gmake2_linux
# Build
for config in debug_x86 release_x86 release_dev_x86 for config in debug_x86 release_x86 release_dev_x86
do do
make config=$config -j$(nproc) make config=$config -j$(nproc)
done done
find ${APPVEYOR_BUILD_FOLDER}/src_rebuild/bin -name 'REDRIVER2*' -exec cp -t ${APPVEYOR_BUILD_FOLDER}/.flatpak/bin {} + cd ${APPVEYOR_BUILD_FOLDER}
# Creating flatpak directories
mkdir -p "${APPVEYOR_BUILD_FOLDER}/.flatpak/lib" "${APPVEYOR_BUILD_FOLDER}/.flatpak/data" "${APPVEYOR_BUILD_FOLDER}/.flatpak/bin"
find ${APPVEYOR_BUILD_FOLDER}/src_rebuild/bin/Release -name 'REDRIVER2*' -exec cp -t ${APPVEYOR_BUILD_FOLDER}/.flatpak/bin {} +
# Copy missing libraries in the runtime # Copy missing libraries in the runtime
for lib in libjpeg libopenal libsndio libbsd for lib in libjpeg libopenal libsndio libbsd
@ -24,7 +25,6 @@ do
done done
cp -r "${APPVEYOR_BUILD_FOLDER}/data" "${APPVEYOR_BUILD_FOLDER}/.flatpak/" cp -r "${APPVEYOR_BUILD_FOLDER}/data" "${APPVEYOR_BUILD_FOLDER}/.flatpak/"
cd ${APPVEYOR_BUILD_FOLDER}
# Editing metadatas with the current version # Editing metadatas with the current version
export APPVEYOR_BUILD_DATE=$(date "+%Y-%m-%d") export APPVEYOR_BUILD_DATE=$(date "+%Y-%m-%d")

View File

@ -26,7 +26,7 @@ export XDG_DATA_DIRS="/var/lib/flatpak/exports/share:${HOME}/.local/share/flatpa
flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
# Adding Platform/SDK for the Linux flatpak release # Adding Platform/SDK for the Linux flatpak release
flatpak --user install flathub org.freedesktop.Platform/x86_64/20.08 -y flatpak --user install flathub org.freedesktop.Platform/x86_64/22.08 -y
flatpak --user install flathub org.freedesktop.Sdk/x86_64/20.08 -y flatpak --user install flathub org.freedesktop.Sdk/x86_64/22.08 -y
flatpak --user install flathub org.freedesktop.Sdk.Compat.i386/x86_64/20.08 -y flatpak --user install flathub org.freedesktop.Sdk.Compat.i386/x86_64/22.08 -y
flatpak --user install flathub org.freedesktop.Sdk.Extension.toolchain-i386/x86_64/20.08 -y flatpak --user install flathub org.freedesktop.Sdk.Extension.toolchain-i386/x86_64/22.08 -y

View File

@ -4,9 +4,9 @@
<metadata_license>MIT</metadata_license> <metadata_license>MIT</metadata_license>
<project_license>MIT</project_license> <project_license>MIT</project_license>
<name>REDRIVER2</name> <name>REDRIVER2</name>
<summary>Driver 2 Playstation game reverse engineering effort</summary> <summary>Driver 2 - Back On The Streets / The Wheelman Is Back</summary>
<description> <description>
<p>Driver 2 Playstation game reverse engineering effort </p> <p>Reverse-Engineered version of Driver 2. https://opendriver2.github.io</p>
</description> </description>
<categories> <categories>
<category>Game</category> <category>Game</category>

View File

@ -13,7 +13,7 @@ function importDefaultData {
} }
if [ ! -d /var/data/DRIVER2 ]; then if [ ! -d /var/data/DRIVER2 ]; then
zenity --error --no-wrap --text="`printf "DRIVER2 files are missing! Add the folder in:\n ${HOME}/.var/io.github.opendriver2.Redriver2/data"`" zenity --error --no-wrap --text="`printf "DRIVER2 files are missing! Please provide DRIVER2 folder in:\n ${HOME}/.var/app/io.github.opendriver2.Redriver2/data"`"
exit 0 exit 0
fi fi

View File

@ -1,7 +1,7 @@
--- ---
app-id: io.github.opendriver2.Redriver2 app-id: io.github.opendriver2.Redriver2
runtime: org.freedesktop.Platform runtime: org.freedesktop.Platform
runtime-version: '20.08' runtime-version: '22.08'
rename-icon: 'icon' rename-icon: 'icon'
sdk: org.freedesktop.Sdk sdk: org.freedesktop.Sdk
command: start.sh command: start.sh
@ -17,14 +17,14 @@ finish-args:
add-extensions: add-extensions:
org.freedesktop.Platform.Compat.i386: org.freedesktop.Platform.Compat.i386:
directory: lib/i386-linux-gnu directory: lib/i386-linux-gnu
version: '20.08' version: '22.08'
org.freedesktop.Platform.Compat.i386.Debug: org.freedesktop.Platform.Compat.i386.Debug:
directory: lib/debug/lib/i386-linux-gnu directory: lib/debug/lib/i386-linux-gnu
version: '20.08' version: '22.08'
no-autodownload: true no-autodownload: true
org.freedesktop.Platform.GL32: org.freedesktop.Platform.GL32:
directory: lib/i386-linux-gnu/GL directory: lib/i386-linux-gnu/GL
version: '20.08' version: '22.08'
subdirectories: true subdirectories: true
no-autodownload: true no-autodownload: true
autodelete: false autodelete: false