Skip to content

Commit

Permalink
appimage: correct version number. fix #1537
Browse files Browse the repository at this point in the history
  • Loading branch information
jcelerier committed Jan 2, 2025
1 parent 0857f65 commit d86dfba
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 26 deletions.
1 change: 1 addition & 0 deletions ci/appimage.build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ docker pull ossia/score-package-linux
docker run \
-v "$SOURCE_FOLDER/cmake/Deployment/Linux/AppImage/Recipe.llvm:/Recipe" \
-e TOOLCHAIN=appimage \
-e TAG="$GITTAGNOV" \
--mount type=bind,source="$PWD/opt/ossia-sdk",target=/opt/ossia-sdk \
--mount type=bind,source="$SOURCE_FOLDER",target=/score \
--mount type=bind,source="$BUILD_FOLDER",target=/build \
Expand Down
2 changes: 1 addition & 1 deletion ci/appimage.deploy.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash -eux
export TAG=$GITTAGNOV
export TAG="$GITTAGNOV"

mv "Score.AppImage" "$BUILD_ARTIFACTSTAGINGDIRECTORY/ossia score-$TAG-linux-amd64.AppImage"
mv "linux-sdk.zip" "$BUILD_ARTIFACTSTAGINGDIRECTORY/"
53 changes: 28 additions & 25 deletions cmake/Deployment/Linux/AppImage/Recipe.llvm
Original file line number Diff line number Diff line change
Expand Up @@ -30,39 +30,42 @@ mkdir -p "$SDK_DIR"
export SOURCE_DIR=/score
export SCORE_DIR=/score

export INSTALL_ROOT=$(cd $APP_DIR/usr; pwd)
export INSTALL_ROOT=$(cd "$APP_DIR/usr"; pwd)

cninja -S "$SOURCE_DIR" -B "$BUILD_DIR" $TOOLCHAIN -- \
-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT \
-DOSSIA_SDK=$OSSIA_SDK \
-DCMAKE_PREFIX_PATH="$OSSIA_SDK/qt6-static" -DCMAKE_C_COMPILER="$CC" -DCMAKE_CXX_COMPILER="$CXX"
cninja -S "$SOURCE_DIR" -B "$BUILD_DIR" "$TOOLCHAIN" -- \
-DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" \
-DOSSIA_SDK="$OSSIA_SDK" \
-DCMAKE_PREFIX_PATH="$OSSIA_SDK/qt6-static" \
-DCMAKE_C_COMPILER="$CC" \
-DCMAKE_CXX_COMPILER="$CXX"

(
cd "$BUILD_DIR"

if [[ "$TOOLCHAIN" =~ ".*debug.*" ]]; then
cmake --install . --component OssiaScore
else
cmake --install . --strip --component OssiaScore
fi

cmake --install . --component Devel --prefix "$SDK_DIR/usr"
(
cd "$SDK_DIR/usr/lib"
echo "== content of $SDK_DIR/usr/lib"
find .
find . -name '*.a' -exec rm -rf {} \;
)
)
(
cd "$BUILD_DIR"

if [[ "$TOOLCHAIN" =~ ".*debug.*" ]]; then
cmake --install . --component OssiaScore
else
cmake --install . --strip --component OssiaScore
fi

cmake --install . --component Devel --prefix "$SDK_DIR/usr"
(
cd "$SDK_DIR/usr/lib"
echo "== content of $SDK_DIR/usr/lib"
find .
find . -name '*.a' -exec rm -rf {} \;
)
)


# Copy pixmaps
cp $APP_DIR/usr/share/applications/ossia-score.desktop $APP_DIR/
cp $APP_DIR/usr/share/pixmaps/ossia-score.png $APP_DIR/
cp "$APP_DIR/usr/share/applications/ossia-score.desktop" "$APP_DIR/"
sed -i "s/3.0.0/$TAG/" "$APP_DIR/ossia-score.desktop"
cp "$APP_DIR/usr/share/pixmaps/ossia-score.png" "$APP_DIR/"

# Copy needed libraries and remove system ones
(
cd $APP_DIR
cd "$APP_DIR"
mkdir -p ./usr/lib/qt6/qml

# Fonts
Expand Down

0 comments on commit d86dfba

Please sign in to comment.