sigrok-native-appimage: Fix order of delete_blacklisted() call.

[sigrok-util.git] / cross-compile / appimage / sigrok-native-appimage

diff --git a/cross-compile/appimage/sigrok-native-appimage b/cross-compile/appimage/sigrok-native-appimage
index 6ea6b9f310bc2eaa85316f07192f165c7a2dd7fb..39845bdbb5ba2b815d30c6fd2c93f3bf27cea745 100755 (executable)
--- a/cross-compile/appimage/sigrok-native-appimage
+++ b/cross-compile/appimage/sigrok-native-appimage
@@ -10,16 +10,27 @@
 
 PREFIX=$HOME/sr
 
+APPIMAGEKIT_OUTDIR=$HOME/AppImageKit/out
+
 ARCH=x86_64
 
+########################################################################
+# 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
 
-. ../contrib/functions.sh
+. $STATIC_FILES/functions.sh
 
 ########################################################################
 # Get build products from $PREFIX
@@ -41,13 +52,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 $STATIC_FILES/pulseview.desktop .
+cp $STATIC_FILES/sigrok-logo-notext.png .
 
 ########################################################################
 # Copy in the dependencies that cannot be assumed to be available
@@ -56,15 +68,26 @@ 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
+
 ########################################################################
 # 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
 
@@ -81,7 +104,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
@@ -90,4 +113,6 @@ patch_usr
 
 cd ..
 
-generate_appimage
+VERSION=$VERSION $APPIMAGEKIT_OUTDIR/appimagetool ./$APP.AppDir/
+mkdir -p ../out/ || true
+mv *.AppImage* ../out/