Provide automatic macOS releases with Apple Silicon support #14839
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,24 +9,36 @@ if [ ! -f "${PPSSPPSDL}" ]; then | |
| fi | ||
|
|
||
| SDL=$(otool -L "${PPSSPPSDL}" | grep -v @executable_path | grep -Eo /.+libSDL.+dylib) | ||
| if [ "${SDL}" != "" ]; then | ||
| if [ ! -f "${SDL}" ]; then | ||
| echo "Cannot locate SDL: ${SDL}!" | ||
| exit 0 | ||
| fi | ||
|
|
||
| echo "Installing SDL from ${SDL}..." | ||
|
|
||
| SDLNAME=$(basename "${SDL}") | ||
| mkdir -p "${PPSSPP}/Contents/Frameworks" || exit 0 | ||
| cp -r "$SDL" "${PPSSPP}/Contents/Frameworks" || exit 0 | ||
| install_name_tool -change "${SDL}" "@executable_path/../Frameworks/${SDLNAME}" "${PPSSPPSDL}" || exit 0 | ||
| elif [ "$(otool -L "${PPSSPPSDL}" | grep @rpath/SDL)" != "" ]; then | ||
| cd "$(dirname "$0")" | ||
| RPATH="$(pwd)/macOS" | ||
| cd - | ||
| SDL="${RPATH}/SDL2.framework" | ||
| if [ ! -d "${SDL}" ]; then | ||
| echo "Cannot locate SDL.framework: ${SDL}!" | ||
| exit 0 | ||
| fi | ||
|
|
||
| rm -rf "${PPSSPP}/Contents/Frameworks/SDL2.framework" || exit 0 | ||
| mkdir -p "${PPSSPP}/Contents/Frameworks" || exit 0 | ||
| cp -a "$SDL" "${PPSSPP}/Contents/Frameworks" || exit 0 | ||
| install_name_tool -rpath "${RPATH}" "@executable_path/../Frameworks" "${PPSSPPSDL}" || echo "Already patched." | ||
| fi | ||
|
|
||
| GIT_VERSION_LINE=$(grep "PPSSPP_GIT_VERSION = " "$(dirname "${0}")/../git-version.cpp") | ||
| echo "Setting version to ${GIT_VERSION_LINE}..." | ||
|
There was a problem hiding this comment. I am worried about the version string in the builds. Currently there seem to be 2 bugs:
There was a problem hiding this comment. I believe fixed (1) in https://github.com/vit9696/ppsspp/commit/ed046aebf5608869fd49fb55204715b01bc5620b. I am not sure what route shall I take to fix (2). Is it alright to make There was a problem hiding this comment. I guess that's fine, as long as it has the right values. I would think you'd need to fetch tags, i.e. -[Unknown] There was a problem hiding this comment. I tried that, but it did not work for me. I believe the reason is that we not only need to fetch the tags, but also connect tags to the history, otherwise one would get |
||
| SHORT_VERSION_MATCH='.*"v([0-9\.]+(-[0-9]+)?).*";' | ||
| LONG_VERSION_MATCH='.*"v(.*)";' | ||
| if [[ "${GIT_VERSION_LINE}" =~ ^${SHORT_VERSION_MATCH}$ ]]; then | ||
|
|
@@ -36,3 +48,6 @@ else | |
| plutil -replace CFBundleShortVersionString -string "" ${PPSSPP}/Contents/Info.plist | ||
| plutil -replace CFBundleVersion -string "" ${PPSSPP}/Contents/Info.plist | ||
| fi | ||
|
|
||
| # AdHoc codesign is required for Apple Silicon. | ||
| codesign -fs - --deep "${PPSSPP}" || exit 1 | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not really a fan of creating releases with generic messages for each release. That's exactly the terrible practice Android apps have started using, and I hate it there too.
-[Unknown]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, it feels natural to me to edit the release message afterwards with e.g. a changelog manually. This code is just a convenience message to have something before this happens. There is no restriction to the amount of edits, so I feel there is no big issue in leaving it as is, especially since there is no good place to source the release message automatically anyway. Correct me if you think I am wrong.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, I don't think anyone will edit them, but okay. Honestly, I'd prefer the release notes were just the version again like now:
https://github.com/hrydgard/ppsspp/releases
Rather than a message that repeats for every single release. Those are not "release notes", those are a description (this repo already has one of those.)
-[Unknown]