StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor(appimage): List manual libs and copy iteratively

Browse Source 
Also preserve symlinks while copying with -P to avoid creating duplicate
files from symlinks on build env system.
This commit is contained in:
Anthony Bilinski 2021-10-27 17:28:42 -07:00
parent 1a44373ddd
commit cb6fd88239
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
appimage/build.sh
View File

@ -31,6 +31,7 @@ readonly OUTPUT_DIR="/output"
readonly BUILD_DIR="/build" readonly BUILD_DIR="/build"
readonly QTOX_BUILD_DIR="$BUILD_DIR"/qtox readonly QTOX_BUILD_DIR="$BUILD_DIR"/qtox
readonly QTOX_APP_DIR="$BUILD_DIR"/appdir readonly QTOX_APP_DIR="$BUILD_DIR"/appdir
readonly LOCAL_LIB_DIR="$QTOX_APP_DIR"/local/lib
# "linuxdeployqt" is to long, shortened to ldqt # "linuxdeployqt" is to long, shortened to ldqt
readonly LDQT_BUILD_DIR="$BUILD_DIR"/ldqt readonly LDQT_BUILD_DIR="$BUILD_DIR"/ldqt
# "appimagetool" becomes aitool # "appimagetool" becomes aitool
@ -161,17 +162,22 @@ eval "$LDQT_BIN $QTOX_DESKTOP_FILE -bundle-non-qt-libs -extra-plugins=libsnore-q
mv "$QTOX_APP_DIR"/usr/* "$QTOX_APP_DIR/" mv "$QTOX_APP_DIR"/usr/* "$QTOX_APP_DIR/"
rm -rf "$QTOX_APP_DIR/usr" rm -rf "$QTOX_APP_DIR/usr"
# copy OpenSSL libs to AppImage
# Warning: This is hard coded to debain:stretch. # Warning: This is hard coded to debain:stretch.
cp /usr/lib/x86_64-linux-gnu/libssl.so* "$QTOX_APP_DIR/local/lib/" libs=(
cp /usr/lib/x86_64-linux-gnu/libcrypt.so* "$QTOX_APP_DIR/local/lib/" # copy OpenSSL libs to AppImage
cp /usr/lib/x86_64-linux-gnu/libcrypto.so* "$QTOX_APP_DIR/local/lib" /usr/lib/x86_64-linux-gnu/libssl.so
/usr/lib/x86_64-linux-gnu/libcrypt.so
/usr/lib/x86_64-linux-gnu/libcrypto.so
# Also bundle libjack.so* without which the AppImage does not work in Fedora Workstation # Also bundle libjack.so* without which the AppImage does not work in Fedora Workstation
cp /usr/lib/x86_64-linux-gnu/libjack.so* "$QTOX_APP_DIR/local/lib" /usr/lib/x86_64-linux-gnu/libjack.so.0
)
# this is important , aitool automatically uses the same filename in .zsync meta file. for lib in "${libs[@]}"; do
# if this name does not match with the one we upload , the update always fails. cp -P $(echo "$lib"*) "$LOCAL_LIB_DIR"
done
# this is important, aitool automatically uses the same filename in .zsync meta file.
# if this name does not match with the one we upload, the update always fails.
if [ -n "${TRAVIS_TAG-}" ] if [ -n "${TRAVIS_TAG-}" ]
then then
VERSION_NAME="${TRAVIS_TAG}" VERSION_NAME="${TRAVIS_TAG}"