X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fappimage%2Fsigrok-native-appimage;h=dd92d7c9955ca423c791f9adc58fa58c05e67226;hp=a044cee181d5c32d56cbe79a274292ea59e0f877;hb=90badf4c7eb886b8e5abae43d532dc81c3879f1e;hpb=ab4456ba479065c3f70671d2458e4ddd3ec32a6d

diff --git a/cross-compile/appimage/sigrok-native-appimage b/cross-compile/appimage/sigrok-native-appimage
index a044cee..dd92d7c 100755
--- a/cross-compile/appimage/sigrok-native-appimage
+++ b/cross-compile/appimage/sigrok-native-appimage
@@ -1,52 +1,50 @@
 #!/bin/bash
+##
+## Copyright (C) 2016 Simon Peter
+## Copyright (C) 2017 Uwe Hermann <uwe@hermann-uwe.de>
+## This file is licensed under the terms of the MIT license.
+##
 
-# (c) 2016 Simon Peter
-# This file is licensed under the terms of the MIT license.
-#
-# Bundle PulseView and its dependencies as an AppImage for x86_64 Linux
-# TODO: Change it to use build products and libraries from a more mature
-# distribution such as Debian oldstable, CentOS 6 or Ubuntu Trusty or older.
+# Bundle PulseView and its dependencies as an AppImage for x86_64 Linux.
+# Note: This assumes the full sigrok stack has been installed into $PREFIX.
+
+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,,} 
 
-ARCH=x86_64
+export STATIC_FILES=`pwd`/contrib
 
-mkdir -p ./$APP/$APP.AppDir/usr/bin ./$APP/$APP.AppDir/usr/lib
+# 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 Jenkins
-# FIXME: Do the actual building here instead
+# Get build products from $PREFIX
 ########################################################################
 
-wget http://sigrok.org/jenkins/job/pulseview/buildtype=shared,compiler=gcc,platform=native-amd64/ws/_inst/bin/*zip*/bin.zip
-unzip bin.zip
-
-FW=$(wget -q "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/?C=M;O=D" -O - | grep .tar.gz | head -n 1 | cut -d '"' -f 13 | cut -d ">" -f 2 | cut -d "<" -f 1)
-wget -c "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/$FW"
-tar xf sigrok-firmware-fx2lafw-bin-*.tar.gz
-rm sigrok-firmware-fx2lafw-bin-*.tar.gz
-
 cd $APP.AppDir/
 
-mv ../bin/pulseview usr/bin/
+cp $PREFIX/bin/pulseview usr/bin/
 chmod a+x usr/bin/*
-
-cd usr/lib/
-wget http://sigrok.org/jenkins/job/libsigrok/buildtype=shared,compiler=gcc,platform=native-amd64/ws/_inst/lib/libsigrok.so.3
-wget http://sigrok.org/jenkins/job/libsigrok/buildtype=shared,compiler=gcc,platform=native-amd64/ws/_inst/lib/libsigrokcxx.so.3
-wget http://sigrok.org/jenkins/job/libserialport/buildtype=shared,compiler=gcc,platform=native-amd64/lastSuccessfulBuild/artifact/_inst/lib/libserialport.so.0
-cd ../../
-
-wget "http://sigrok.org/jenkins/job/libsigrokdecode/buildtype=shared,compiler=gcc,platform=native-amd64/lastSuccessfulBuild/artifact/*zip*/archive.zip"
-unzip archive.zip
-mv archive/_inst/share/libsigrokdecode usr/share/libsigrokdecode
-mv archive/_inst/lib/libsigrokdecode.so.3 usr/lib/
-rm -rf archive*
+cp $PREFIX/lib/lib*.so* usr/lib/
+cp -r $PREFIX/share/libsigrokdecode usr/share/
+cp -r $PREFIX/share/sigrok-firmware usr/share/
 
 # Reduce binary size
 strip usr/bin/*
@@ -56,45 +54,57 @@ 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
 ########################################################################
 
-wget http://sigrok.org/jenkins/job/pulseview/buildtype=shared,compiler=gcc,platform=native-amd64/ws/contrib/pulseview.desktop
-wget -q "http://sigrok.org/gitweb/?p=pulseview.git;a=blob_plain;f=icons/sigrok-logo-notext.png" -O sigrok-logo-notext.png
-
-########################################################################
-# Patch away absolute paths; it would be nice if they were relative
-########################################################################
-
-sed -i -e 's|/home/jenkins_slave/fsroot/workspace/libsigrokdecode/buildtype/shared/compiler/gcc/platform/native-amd64/_inst/share/|.//////////////////////////////////////////////////////////////////////////////////////////////////////////////share/|g' usr/lib/libsigrokdecode.so.3
+cp $STATIC_FILES/pulseview.desktop .
+cp $STATIC_FILES/sigrok-logo-notext.png .
 
 ########################################################################
 # Copy in the dependencies that cannot be assumed to be available
 # on all target systems
 ########################################################################
 
-mkdir -p usr/share/
-mv ../sigrok-firmware-* usr/share/sigrok-firmware
-
 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
+
+# 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
+
 ########################################################################
 # Determine the version of the app; also include needed glibc version
 ########################################################################
 
-VER1=$(./AppRun --version | cut -d " "  -f 2)
+VER1="NIGHTLY"
 GLIBC_NEEDED=$(glibc_needed)
 VERSION=$VER1.glibc$GLIBC_NEEDED
 echo $VERSION
@@ -103,7 +113,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
@@ -112,4 +122,6 @@ patch_usr
 
 cd ..
 
-generate_appimage
+VERSION=$VERSION $APPIMAGEKIT_OUTDIR/appimagetool ./$APP.AppDir/
+mkdir -p ../out/ || true
+mv *.AppImage* ../out/