X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fappimage%2Fsigrok-native-appimage;h=9a7cd064b04b93f0c3194285fba42531c3398c92;hp=6476677683dca91b0b7e27a9c88f09dc8abd9adb;hb=fe8f66a93d7818d292cbd810fe79e5431a2a0aa6;hpb=23c1d906f8a2d0bdeb2923bbc318eb52ea142ef1

diff --git a/cross-compile/appimage/sigrok-native-appimage b/cross-compile/appimage/sigrok-native-appimage
index 6476677..9a7cd06 100755
--- a/cross-compile/appimage/sigrok-native-appimage
+++ b/cross-compile/appimage/sigrok-native-appimage
@@ -10,17 +10,29 @@
 
 PREFIX=$HOME/sr
 
+APPIMAGEKIT_OUTDIR=$HOME/AppImageKit/out
+
 ARCH=x86_64
 
+PYVER=3.4
+
+########################################################################
+# You usually don't have to change anything below this line
+########################################################################
+
 APP=PulseView
 LOWERAPP=${APP,,} 
 
+export STATIC_FILES=`pwd`/contrib
+
+# Add $APPIMAGEKIT_OUTDIR so we can find all the binaries there.
+export PATH=$APPIMAGEKIT_OUTDIR:$PATH
+
 A="./$APP/$APP.AppDir"
 mkdir -p $A/usr/bin $A/usr/lib $A/usr/share
 cd ./$APP
 
-wget -q https://github.com/probonopd/AppImages/raw/master/functions.sh -O ./functions.sh
-. ./functions.sh
+. $STATIC_FILES/functions.sh
 
 ########################################################################
 # Get build products from $PREFIX
@@ -33,6 +45,10 @@ chmod a+x usr/bin/*
 cp $PREFIX/lib/lib*.so* usr/lib/
 cp -r $PREFIX/share/libsigrokdecode usr/share/
 cp -r $PREFIX/share/sigrok-firmware usr/share/
+cp -r $PREFIX/share/applications usr/share/
+cp -r $PREFIX/share/icons usr/share/
+cp -r $PREFIX/share/metainfo usr/share/
+cp -r $PREFIX/share/mime usr/share/
 
 # Reduce binary size
 strip usr/bin/*
@@ -42,13 +58,14 @@ strip usr/lib/*
 # AppRun is the main launcher that gets executed when AppImage is run
 ########################################################################
 
-get_apprun
+cp $APPIMAGEKIT_OUTDIR/AppRun .
 
 ########################################################################
 # Copy desktop and icon file to AppDir for AppRun to pick them up
 ########################################################################
 
-cp ../../contrib/pulseview.desktop ../../contrib/sigrok-logo-notext.png .
+cp usr/share/applications/*.desktop .
+cp usr/share/icons/hicolor/48x48/apps/pulseview.png .
 
 ########################################################################
 # Copy in the dependencies that cannot be assumed to be available
@@ -57,15 +74,37 @@ cp ../../contrib/pulseview.desktop ../../contrib/sigrok-logo-notext.png .
 
 copy_deps
 
+# Get all Qt5 plugins (won't be copied automatically).
+QT5PLUGINS=/usr/lib/x86_64-linux-gnu/qt5/plugins # Host (+ AppRun) path.
+mkdir -p .$QT5PLUGINS
+cp -r $QT5PLUGINS/accessible .$QT5PLUGINS
+cp -r $QT5PLUGINS/generic .$QT5PLUGINS
+cp -r $QT5PLUGINS/iconengines .$QT5PLUGINS
+cp -r $QT5PLUGINS/imageformats .$QT5PLUGINS
+cp -r $QT5PLUGINS/platforminputcontexts .$QT5PLUGINS
+cp -r $QT5PLUGINS/platforms .$QT5PLUGINS
+
+# Get some additional dependencies of the Qt5 plugins.
+ldd .$QT5PLUGINS/platforms/libqxcb.so | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true
+ldd .$QT5PLUGINS/imageformats/libqsvg.so | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true
+
+# Python 3
+cp /usr/lib/x86_64-linux-gnu/libpython$PYVER* ./usr/lib
+mkdir -p ./usr/share/pyshared
+cp -r /usr/lib/python$PYVER/* ./usr/share/pyshared # AppRun expects this path.
+
+cp -r ./usr/share/pyshared/plat-x86_64-linux-gnu/* ./usr/share/pyshared
+
 ########################################################################
 # Delete stuff that should not go into the AppImage
 ########################################################################
 
-delete_blacklisted
 move_lib
 mv ./usr/lib/x86_64-linux-gnu/* usr/lib/
 rm -r ./usr/lib/x86_64-linux-gnu/
 
+delete_blacklisted
+
 # Remove some incorrectly/unintentionally copied files.
 rm -r ./home
 
@@ -82,7 +121,7 @@ echo $VERSION
 # Patch away absolute paths; it would be nice if they were relative
 ########################################################################
 
-patch_usr
+find usr/ -type f -executable -exec sed -i -e "s|/usr|././|g" {} \;
 
 ########################################################################
 # AppDir complete
@@ -91,4 +130,6 @@ patch_usr
 
 cd ..
 
-generate_appimage
+VERSION=$VERSION $APPIMAGEKIT_OUTDIR/appimagetool ./$APP.AppDir/
+mkdir -p ../out/ || true
+mv *.AppImage* ../out/