Add AppImage support to Linux builds #3688
Fix shellcheck, cosmetic stuff
- Loading branch information
commit c33c4e5555e83ebaac8a45a9441e4daa93c8186c
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,44 +8,66 @@ | |
|
|
||
| set -e | ||
|
|
||
| LINUXDEPLOYQT="$HOME/bin/linuxdeployqt" | ||
| VERBOSITY=2 # 3=debug | ||
| LOGFILE="@CMAKE_BINARY_DIR@/linuxdeployqt.log" | ||
| APPDIR="@CMAKE_BINARY_DIR@/@[email protected]/" | ||
| DESKTOPFILE="${APPDIR}usr/share/applications/lmms.desktop" | ||
| STRIP="" | ||
|
|
||
| # Don't strip for debug builds | ||
| if [[ "@CMAKE_BUILD_TYPE@" == *"Debug"* ]]; then | ||
| STRIP="-no-strip" | ||
| fi | ||
|
|
||
| # Console colors | ||
| RED="\\x1B[1;31m" | ||
| GREEN="\\x1B[1;32m" | ||
| YELLOW="\\x1B[1;33m" | ||
| PLAIN="\\x1B[0m" | ||
|
|
||
| function error { | ||
| echo -e " ${PLAIN}[${RED}error${PLAIN}] ${1}" | ||
| return 1 | ||
| } | ||
|
|
||
| function success { | ||
| echo -e " ${PLAIN}[${GREEN}success${PLAIN}] ${1}" | ||
| } | ||
|
|
||
| function skipped { | ||
| echo -e " ${PLAIN}[${YELLOW}skipped${PLAIN}] ${1}" | ||
| } | ||
|
|
||
| echo -e "\nWriting verbose output to \"${LOGFILE}\"" | ||
|
|
||
| # Fetch portable linuxdeployqt if cache is older than $DAYSOLD | ||
| echo -e "\nDownloading linuxdeployqt to ${LINUXDEPLOYQT}..." | ||
| mkdir -p "$HOME/bin" | ||
| DAYSOLD=2 | ||
| if which linuxdeployqt > /dev/null d2>&1; then | ||
| skipped "System already provides this utility" | ||
| elif ! find "$LINUXDEPLOYQT" -mtime -$DAYSOLD 2>/dev/null|grep -q "." > /dev/null 2>&1; then | ||
| url="https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-$(uname -p).AppImage" | ||
| echo " [.......] Couldn't find linuxdeployqt newer than $DAYSOLD days old" | ||
| echo " [.......] Downloading ($(uname -p)): ${url}" | ||
| wget "$url" -O "$LINUXDEPLOYQT" -q || (rm "$LINUXDEPLOYQT" && false) | ||
| chmod +x "$LINUXDEPLOYQT" | ||
| success "Downloaded $LINUXDEPLOYQT" | ||
| else | ||
| skipped "$LINUXDEPLOYQT is less than $DAYSOLD days old" | ||
| fi | ||
|
|
||
| # Make skeleton AppDir | ||
| echo -e "\nCreating ${APPDIR}..." | ||
| rm -rf "$APPDIR" | ||
| mkdir -p "$APPDIR/usr" | ||
| success "Created ${APPDIR}" | ||
|
|
||
| # Clone install to AppDir | ||
|
There was a problem hiding this comment. Why do you think this is needed? When you install your build products with
Member
Author
There was a problem hiding this comment. This is a post-install step, so it's irrelevant. There was a problem hiding this comment. I don't understand this comment, why are you doing it when it is irrelevant? |
||
| echo -e "\nCopying @CMAKE_INSTALL_PREFIX@ to ${APPDIR}..." | ||
| cp -R "@CMAKE_INSTALL_PREFIX@/." "$APPDIR/usr" | ||
| success "${APPDIR}" | ||
|
|
||
| # Create a wrapper script which calls the lmms executable | ||
| mv "$APPDIR/usr/bin/lmms" "$APPDIR/usr/bin/lmms.real" | ||
|
|
@@ -72,22 +94,25 @@ mv "$VSTLIB" "$VSTBIN" | |
| sed -i 's/.*Exec=.*/Exec=lmms.real/' "$DESKTOPFILE" | ||
|
|
||
| # Bundle both qt and non-qt dependencies into appimage format | ||
| echo -e "\nBundling and relinking system dependencies..." | ||
| echo -e "#### linuxdeployqt pass 1 ####" > "$LOGFILE" | ||
| "$LINUXDEPLOYQT" "$DESKTOPFILE" -executable="$ZYNBIN" -executable="$VSTBIN" -bundle-non-qt-libs -verbose=$VERBOSITY $STRIP >> "$LOGFILE" 2>&1 | ||
| success "Bundled and relinked dependencies" | ||
|
|
||
| # Move executables back to lib directory | ||
| mv "$ZYNBIN" "$ZYNLIB" | ||
| mv "$VSTBIN" "$VSTLIB" | ||
|
|
||
| # Run a second time to create AppImage | ||
| echo -e "\nFinishing the AppImage..." | ||
| echo -e "\n\n#### linuxdeployqt pass 2 ####" > "$LOGFILE" | ||
| "$LINUXDEPLOYQT" "$DESKTOPFILE" -appimage -verbose=$VERBOSITY $STRIP >> "$LOGFILE" 2>&1 | ||
| success "Created .AppImage" | ||
|
|
||
| echo -e "\nMoving to @APPIMAGE_FILE@..." | ||
| # FIXME | ||
| # Per https://github.com/probonopd/linuxdeployqt/issues/146 | ||
| mv ./*.AppImage "@APPIMAGE_FILE@" | ||
| success "Created @APPIMAGE_FILE@" | ||
|
|
||
| echo -e "\nFinished" | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Why do you think this is needed? When you install your build products with
make INSTALL_ROOT="$APPDIR" installthen they will end up there.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.
This is post-install step, so it's irrelevant.
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 don't understand this comment, why are you doing it when it is irrelevant?
Uh oh!
There was an error while loading. Please reload this page.
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.
Your comment is irrelevant. You're telling a project how to specify the
installtarget, which is too late when it's a post-install step. We can script the entire thing like we do for Windows, but then it takes away the granularity of developers specifying their own build environment.We copy the
installinstead of messing it all up. Ideally, the/usrmandate would be dropped and then we can use whatever folder we want. That's howmacdeployqtworks for us.It's really not your place to tell a project, or a user for that matter where to drop an install target. This may make sense for a small project. But (I feel) for large, complex projects, it's presumptuous.
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.
So where would you ideally like to install? The reasonis that (at least for some software), the path specified with
DCMAKE_INSTALL_PREFIXends up in the compiled binaries, which is what I generally want to avoid, hence recommending/usras the generic prefix. This is not a hard requirement though and you are free to use another prefix.Uh oh!
There was an error while loading. Please reload this page.
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.
Wherever the user says to, would be the ideal location. For our tutorials, this is usually
/home/user/lmms/target, but I often run a second copy from/home/user/Desktop/lmms/targetand others may prefer their own place.This is the part that confuses me... I would expect a relinking tool to be agnostic of the prefix, but to be fair, I've also never written one. :)