X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fappimage%2Fsigrok-native-appimage;h=01cf8479b11ef6714c8abfae65640e7e50851a3d;hp=df14dfa01ad072b5b032df1aba79fe18b55d6bbe;hb=81a786537c1c77f39a4578356875471b615a0228;hpb=9118290a6cc05dd0e135b2820aaf3d8d5e05a182

diff --git a/cross-compile/appimage/sigrok-native-appimage b/cross-compile/appimage/sigrok-native-appimage
index df14dfa..01cf847 100755
--- a/cross-compile/appimage/sigrok-native-appimage
+++ b/cross-compile/appimage/sigrok-native-appimage
@@ -1,28 +1,34 @@
 #!/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/i386 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
+PYVER=3.5
 
 ########################################################################
 # 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 ARCH
 export STATIC_FILES=`pwd`/contrib
 
 # Add $APPIMAGEKIT_OUTDIR so we can find all the binaries there.
@@ -40,16 +46,28 @@ 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/
-cp -r $PREFIX/share/applications 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/*
 strip usr/lib/*
@@ -64,8 +82,8 @@ cp $APPIMAGEKIT_OUTDIR/AppRun .
 # Copy desktop and icon file to AppDir for AppRun to pick them up
 ########################################################################
 
-cp usr/share/applications/*.desktop .
-cp usr/share/icons/hicolor/48x48/apps/pulseview.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
@@ -74,19 +92,24 @@ cp usr/share/icons/hicolor/48x48/apps/pulseview.png .
 
 copy_deps
 
-# 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
+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/bearer .$QT5PLUGINS
+	cp -r $QT5PLUGINS/egldeviceintegrations .$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
+	cp -r $QT5PLUGINS/printsupport .$QT5PLUGINS
+	cp -r $QT5PLUGINS/xcbglintegrations .$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
@@ -109,12 +132,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
 
 ########################################################################