mchapman/Ryujinx-greemdev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to check if canary in create_macos_build_ava.sh and in create_macos_build_ava_headless.sh instead of in seperate files

Browse Source 
This helps keeping things concise and should maybe work well idk
This commit is contained in:
GabCoolGuy
2024-11-20 22:11:05 +01:00
parent fbd9a441fb
commit 77fc9348b9
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
distribution/macos/create_macos_build_ava.sh
View File

@@ -3,7 +3,7 @@
set -e
if [ "$#" -lt 7 ]; then
echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <EXTRA_ARGS>"
echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <EXTRA_ARGS> <CANARY>"
exit 1
fi
@@ -19,9 +19,13 @@ VERSION=$5
SOURCE_REVISION_ID=$6
CONFIGURATION=$7
EXTRA_ARGS=$8
CANARY=$9
if [ "$VERSION" == "1.1.0" ];
# shellcheck disable=SC2107
if [ "$VERSION" == "1.1.0" && "$CANARY" == 1 ];
then
RELEASE_TAR_FILE_NAME=ryujinx-canary-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
elif [ "$VERSION" == "1.1.0" && "$CANARY" == 0 ];
RELEASE_TAR_FILE_NAME=ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
else
RELEASE_TAR_FILE_NAME=ryujinx-$VERSION-macos_universal.app.tar
@@ -61,7 +65,7 @@ mkdir -p "$OUTPUT_DIRECTORY"
cp -R "$ARM64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE"
rm "$UNIVERSAL_APP_BUNDLE/$EXECUTABLE_SUB_PATH"
# Make it libraries universal
# Make its libraries universal
python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_BUNDLE" "$X64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE" "**/*.dylib"
if ! [ -x "$(command -v lipo)" ];

10
distribution/macos/create_macos_build_headless.sh
View File

@@ -19,12 +19,16 @@ VERSION=$5
SOURCE_REVISION_ID=$6
CONFIGURATION=$7
EXTRA_ARGS=$8
CANARY=$9
if [ "$VERSION" == "1.1.0" ];
# shellcheck disable=SC2107
if [ "$VERSION" == "1.1.0" && "$CANARY" == 1 ];
then
RELEASE_TAR_FILE_NAME=nogui-ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.tar
RELEASE_TAR_FILE_NAME=ryujinx-canary-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
elif [ "$VERSION" == "1.1.0" && "$CANARY" == 0 ];
RELEASE_TAR_FILE_NAME=ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
else
RELEASE_TAR_FILE_NAME=nogui-ryujinx-$VERSION-macos_universal.tar
RELEASE_TAR_FILE_NAME=ryujinx-$VERSION-macos_universal.app.tar
fi
ARM64_OUTPUT="$TEMP_DIRECTORY/publish_arm64"