X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fappimage%2Fsigrok-native-appimage;h=290ff3c7f69b0f16b3ed0e507f5be73beea026a6;hp=39845bdbb5ba2b815d30c6fd2c93f3bf27cea745;hb=fd000407bdb400d6df788072ee298d220e180e1a;hpb=e163385a1eeee7666c1a484fde7bd4f63c4acd48

diff --git a/cross-compile/appimage/sigrok-native-appimage b/cross-compile/appimage/sigrok-native-appimage
index 39845bd..290ff3c 100755
--- a/cross-compile/appimage/sigrok-native-appimage
+++ b/cross-compile/appimage/sigrok-native-appimage
@@ -1,24 +1,31 @@
 #!/bin/bash
 ##
 ## Copyright (C) 2016 Simon Peter
-## Copyright (C) 2017 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2017-2018 Uwe Hermann <uwe@hermann-uwe.de>
 ## This file is licensed under the terms of the MIT license.
 ##
 
-# Bundle PulseView and its dependencies as an AppImage for x86_64 Linux.
+# Bundle PulseView/sigrok-cli (and deps) as an AppImage for x86_64/i386 Linux.
 # Note: This assumes the full sigrok stack has been installed into $PREFIX.
 
 PREFIX=$HOME/sr
 
-APPIMAGEKIT_OUTDIR=$HOME/AppImageKit/out
+APPIMAGEKIT_OUTDIR=$HOME/AppImageKit/build/out
 
+# ARCH=i386
 ARCH=x86_64
 
+PYVER=3.4
+
 ########################################################################
 # You usually don't have to change anything below this line
 ########################################################################
 
-APP=PulseView
+if [ "x$1" = "xsigrok-cli" ]; then
+	APP=sigrok-cli
+else
+	APP=PulseView
+fi
 LOWERAPP=${APP,,} 
 
 export STATIC_FILES=`pwd`/contrib
@@ -38,11 +45,27 @@ cd ./$APP
 
 cd $APP.AppDir/
 
-cp $PREFIX/bin/pulseview usr/bin/
+cp $PREFIX/bin/$LOWERAPP usr/bin/
 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/
+mkdir -p usr/share/applications
+cp $PREFIX/share/applications/org.sigrok.$APP.desktop usr/share/applications
+cp -r $PREFIX/share/icons usr/share/
+cp -r $PREFIX/share/metainfo usr/share/
+cp -r $PREFIX/share/mime usr/share/
+
+# Drop unneeded stuff.
+if [ "x$1" = "xsigrok-cli" ]; then
+	rm -f usr/lib/libsigc*
+	rm -f usr/lib/libglibmm*
+	rm -f usr/lib/libsigrokcxx*
+	rm -f usr/share/icons/hicolor/*/apps/pulseview.*
+	rm -f usr/share/metainfo/org.sigrok.PulseView.appdata.xml
+else
+	rm -f usr/share/icons/hicolor/scalable/apps/sigrok-cli.svg
+fi
 
 # Reduce binary size
 strip usr/bin/*
@@ -58,8 +81,8 @@ cp $APPIMAGEKIT_OUTDIR/AppRun .
 # Copy desktop and icon file to AppDir for AppRun to pick them up
 ########################################################################
 
-cp $STATIC_FILES/pulseview.desktop .
-cp $STATIC_FILES/sigrok-logo-notext.png .
+cp $PREFIX/share/applications/org.sigrok.$APP.desktop .
+cp $PREFIX/share/icons/hicolor/scalable/apps/$LOWERAPP.svg .
 
 ########################################################################
 # Copy in the dependencies that cannot be assumed to be available
@@ -68,23 +91,36 @@ cp $STATIC_FILES/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
+if [ "x$1" != "xsigrok-cli" ]; then
+	# Get all Qt5 plugins (won't be copied automatically).
+	QT5PLUGINS=/usr/lib/$ARCH-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
+fi
+
+# Python 3
+cp /usr/lib/$ARCH-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-$ARCH-linux-gnu/* ./usr/share/pyshared
 
 ########################################################################
 # Delete stuff that should not go into the AppImage
 ########################################################################
 
 move_lib
-mv ./usr/lib/x86_64-linux-gnu/* usr/lib/
-rm -r ./usr/lib/x86_64-linux-gnu/
+mv ./usr/lib/$ARCH-linux-gnu/* usr/lib/
+rm -r ./usr/lib/$ARCH-linux-gnu/
 
 delete_blacklisted
 
@@ -92,12 +128,10 @@ delete_blacklisted
 rm -r ./home
 
 ########################################################################
-# Determine the version of the app; also include needed glibc version
+# Determine the version of the app
 ########################################################################
 
-VER1="NIGHTLY"
-GLIBC_NEEDED=$(glibc_needed)
-VERSION=$VER1.glibc$GLIBC_NEEDED
+VERSION="NIGHTLY"
 echo $VERSION
 
 ########################################################################