encounter/linuxdeploy
0
0
Fork 0
mirror of https://github.com/encounter/linuxdeploy.git synced 2026-07-10 12:18:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_deploy_library_destinationPath

Browse Source
This commit is contained in:
TheAssassin
2018-07-18 21:46:25 +02:00
committed by GitHub
parent 03cae41d55 c10eafe823
commit c1452fa870
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -27,7 +27,7 @@ matrix:
- libfuse2:i386
install:
- git clone https://github.com/NixOS/patchelf.git
- git clone https://github.com/NixOS/patchelf.git -b 0.8
- cd patchelf
- ./bootstrap.sh
- if [ "$ARCH" == "i386" ]; then export EXTRA_CONFIGURE_ARGS=("--build=i686-pc-linux-gnu" "CFLAGS=-m32" "CXXFLAGS=-m32" "LDFLAGS=-m32"); fi
src/core/elf.cpp
+5 -1
View File
@@ -99,7 +99,11 @@ namespace linuxdeploy {
util::trim(libraryPath);
paths.push_back(bf::absolute(libraryPath));
} else {
ldLog() << LD_DEBUG << "Invalid ldd output: " << line << std::endl;
if (util::stringContains("not found", line)) {
ldLog() << LD_ERROR << "Could not find dependency:" << line << std::endl;
} else {
ldLog() << LD_DEBUG << "Invalid ldd output: " << line << std::endl;
}
}
}
travis/build.sh
+9
View File
@@ -55,6 +55,15 @@ mv squashfs-root/ AppDir/plugins/linuxdeploy-plugin-appimage
ln -s ../../plugins/linuxdeploy-plugin-appimage/AppRun AppDir/usr/bin/linuxdeploy-plugin-appimage
# bundle Qt plugin
wget https://github.com/TheAssassin/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-"$ARCH".AppImage
chmod +x linuxdeploy-plugin-qt-"$ARCH".AppImage
./linuxdeploy-plugin-qt-"$ARCH".AppImage --appimage-extract
mv squashfs-root/ AppDir/plugins/linuxdeploy-plugin-qt
ln -s ../../plugins/linuxdeploy-plugin-qt/AppRun AppDir/usr/bin/linuxdeploy-plugin-qt
# build AppImage using plugin
AppDir/usr/bin/linuxdeploy-plugin-appimage --appdir AppDir/