diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-04-28 10:14:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-28 08:14:44 +0000 |
| commit | 12504f280c1ab51b208d0eff8a60594e208315a2 (patch) | |
| tree | 04c1c5fe7f19ab885838151e7686a6069eca1c00 | |
| parent | 250fc51374d39b4ea08d45b12d9674dd8b3451eb (diff) | |
Fix paths and typos for macOS scripts (#4738)1.1.736
* Fix paths and typos for macOS scripts
* Update outdated comments about rcodesign
---------
Co-authored-by: Mary <thog@protonmail.com>
| -rwxr-xr-x | distribution/macos/create_app_bundle.sh | 6 | ||||
| -rwxr-xr-x | distribution/macos/create_macos_release.sh | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/distribution/macos/create_app_bundle.sh b/distribution/macos/create_app_bundle.sh index 0886bc24..858c06f5 100755 --- a/distribution/macos/create_app_bundle.sh +++ b/distribution/macos/create_app_bundle.sh @@ -41,12 +41,10 @@ then exit 1 fi - # NOTE: Currently require https://github.com/indygreg/apple-platform-rs/pull/44 to work on other OSes. - # cargo install --git "https://github.com/marysaka/apple-platform-rs" --branch "fix/adhoc-app-bundle" apple-codesign --bin "rcodesign" + # cargo install apple-codesign echo "Usign rcodesign for ad-hoc signing" rcodesign sign --entitlements-xml-path "$ENTITLEMENTS_FILE_PATH" "$APP_BUNDLE_DIRECTORY" else echo "Usign codesign for ad-hoc signing" codesign --entitlements "$ENTITLEMENTS_FILE_PATH" -f --deep -s - "$APP_BUNDLE_DIRECTORY" -fi - +fi
\ No newline at end of file diff --git a/distribution/macos/create_macos_release.sh b/distribution/macos/create_macos_release.sh index be56c135..59eb1efd 100755 --- a/distribution/macos/create_macos_release.sh +++ b/distribution/macos/create_macos_release.sh @@ -30,14 +30,14 @@ mkdir -p "$TEMP_DIRECTORY" DOTNET_COMMON_ARGS="-p:DebugType=embedded -p:Version=$VERSION -p:SourceRevisionId=$SOURCE_REVISION_ID --self-contained true" dotnet restore -dotnet build -c Release Ryujinx.Ava -dotnet publish -c Release -r osx-arm64 -o "$TEMP_DIRECTORY/publish_arm64" $DOTNET_COMMON_ARGS Ryujinx.Ava -dotnet publish -c Release -r osx-x64 -o "$TEMP_DIRECTORY/publish_x64" $DOTNET_COMMON_ARGS Ryujinx.Ava +dotnet build -c Release src/Ryujinx.Ava +dotnet publish -c Release -r osx-arm64 -o "$TEMP_DIRECTORY/publish_arm64" $DOTNET_COMMON_ARGS src/Ryujinx.Ava +dotnet publish -c Release -r osx-x64 -o "$TEMP_DIRECTORY/publish_x64" $DOTNET_COMMON_ARGS src/Ryujinx.Ava -# Get ride of the support library for ARMeilleur for x64 (that's only for arm64) +# Get rid of the support library for ARMeilleure for x64 (that's only for arm64) rm -rf "$TEMP_DIRECTORY/publish_x64/libarmeilleure-jitsupport.dylib" -# Get ride of libsoundio from arm64 builds as we don't have a arm64 variant +# Get rid of libsoundio from arm64 builds as we don't have a arm64 variant # TODO: remove this once done rm -rf "$TEMP_DIRECTORY/publish_arm64/libsoundio.dylib" @@ -102,4 +102,4 @@ gzip -9 < $RELEASE_TAR_FILE_NAME > $RELEASE_TAR_FILE_NAME.gz rm $RELEASE_TAR_FILE_NAME popd -echo "Done" +echo "Done"
\ No newline at end of file |