Skip to content

Commit

Permalink
ci/kuiper: workflow that build Scopy for Kuiper
Browse files Browse the repository at this point in the history
Signed-off-by: Bindea Cristian <[email protected]>
  • Loading branch information
bindea-cristian committed Mar 27, 2024
1 parent 0a09374 commit a9ce217
Show file tree
Hide file tree
Showing 9 changed files with 77 additions and 5 deletions.
13 changes: 13 additions & 0 deletions ci/kuiper/AppRun
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
set -e
SELF=$(readlink -f "$0")
HERE=${SELF%/*}

export QT_PLUGIN_PATH=$HERE/usr/plugins
export QT_QPA_PLATFORM_PLUGIN_PATH=$HERE/usr/plugins/platforms
export LD_LIBRARY_PATH=$HERE/usr/lib

echo LD_LIBRARY_PATH: $LD_LIBRARY_PATH
echo PATH: $PATH
ldd $HERE/usr/bin/scopy
exec $HERE/usr/bin/scopy
Binary file added ci/kuiper/AppRun-armhf
Binary file not shown.
40 changes: 40 additions & 0 deletions ci/kuiper/copy-deps.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/bin/bash

set -x
SRC_DIR=$(git rev-parse --show-toplevel)
source $SRC_DIR/ci/kuiper/kuiper_build_config.sh

BINARY=$1
LOCATION=$2


if [ ! -f "${SRC_DIR}"/ci/kuiper/ldd-mod ]; then
sed 's|.*RTLDLIST=.*|RTLDLIST="/usr/arm-linux-gnueabihf/lib/ld-2.31.so /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3"|' /usr/bin/ldd | tee "${SRC_DIR}"/ci/kuiper/ldd-mod
chmod +x "${SRC_DIR}"/ci/kuiper/ldd-mod
fi

export LD_LIBRARY_PATH="${SYSROOT}/lib:${SYSROOT}/lib/arm-linux-gnueabihf:${SYSROOT}/usr/arm-linux-gnueabihf/lib:${SYSROOT}/usr/local/qt5.15:${SYSROOT}/usr/local/lib:${SRC_DIR}/build"
LIBS_ARRAY=()
run_ldd(){
for library in $("${SRC_DIR}"/ci/kuiper/ldd-mod "$1" | cut -d '>' -f 2 | awk '{print $1}')
do
# check if the library exists at that path and if was processed already
if [ -f "${library}" ] && ! [[ "${LIBS_ARRAY[*]}" =~ "${library}" ]]; then
LIBS_ARRAY+=("${library}")
echo "---NEW--- ${library}"
if [ ! -f "${LOCATION}"/"${library##*/}" ]; then
cp --verbose "${library}" "${LOCATION}"
[ -L "${library}" ] && cp --verbose "$(realpath "${library}")" "${LOCATION}"
fi
run_ldd "${library}"
fi
done
}

for arg in $BINARY; do
run_ldd "${arg}"
done



# "
Binary file added ci/kuiper/runtime-armhf
Binary file not shown.
10 changes: 10 additions & 0 deletions ci/kuiper/scopy.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Desktop Entry]
Version=1.0
Icon=scopy
Exec=scopy
Terminal=false
Type=Application
Categories=Science
Name=Scopy
GenericName=Oscilloscope
Comment=A software oscilloscope
9 changes: 6 additions & 3 deletions common/src/scopyconfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ QString scopy::config::localPluginFolderPath()
#if defined __APPLE__
return QCoreApplication::applicationDirPath() + "/plugins/plugins";
#endif

return SCOPY_PLUGIN_BUILD_PATH;
// TODO: a check for ARM
// Quickfix for testing purposes
return QCoreApplication::applicationDirPath() + "/../share/plugins";
}

QString scopy::config::defaultTranslationFolderPath() { return SCOPY_TRANSLATION_INSTALL_PATH; }
Expand All @@ -38,7 +39,9 @@ QString scopy::config::localTranslationFolderPath()
return QCoreApplication::applicationDirPath() + "/translations";
#endif

return SCOPY_TRANSLATION_BUILD_PATH;
// TODO: a check for ARM
// Quickfix for testing purposes
return QCoreApplication::applicationDirPath() + "/../share/translations";
}

QString scopy::config::preferencesFolderPath()
Expand Down
6 changes: 5 additions & 1 deletion core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ endif()
option(WITH_PYTHON "Enable Python" ON)
if(${WITH_PYTHON})
set(Python_ADDITIONAL_VERSIONS 3)
find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
if(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
find_package(Python3 REQUIRED COMPONENTS Interpreter)
else()
find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
endif()
set(PYTHON_VERSION python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR})
set(PYTHON_VERSION ${PYTHON_VERSION} PARENT_SCOPE)
if(NOT Python3_FOUND)
Expand Down
4 changes: 3 additions & 1 deletion core/src/scopymainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,9 @@ void ScopyMainWindow::loadDecoders()
#if defined __APPLE__
QString path = QCoreApplication::applicationDirPath() + "/decoders";
#else
QString path = "decoders";
// TODO: a check for ARM
// Quickfix for testing purposes
QString path = QCoreApplication::applicationDirPath() + "/../lib/decoders";
#endif

bool success = true;
Expand Down
Binary file added gui/res/scopy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a9ce217

Please sign in to comment.