From d1a6f4600b34ebe12b0d142b8433875fac577808 Mon Sep 17 00:00:00 2001 From: nicomiguelino Date: Wed, 17 Jul 2024 18:15:31 +0000 Subject: [PATCH] draft: tweak webview build scripts for dev mode --- webview/Dockerfile | 1 - webview/build_qt5.sh | 35 +++++++++++++++-------------------- webview/src/main.cpp | 16 ++++++++++++++++ 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/webview/Dockerfile b/webview/Dockerfile index 8eae07911..e0ffe5e99 100644 --- a/webview/Dockerfile +++ b/webview/Dockerfile @@ -192,4 +192,3 @@ ARG GIT_HASH=0 ENV GIT_HASH=$GIT_HASH COPY build_qt5.sh /usr/local/bin/ -CMD /usr/local/bin/build_qt5.sh diff --git a/webview/build_qt5.sh b/webview/build_qt5.sh index 5af889204..2c040bfb5 100755 --- a/webview/build_qt5.sh +++ b/webview/build_qt5.sh @@ -243,30 +243,26 @@ function build_qt () { echo "QT Build already exist." fi - if [ ! -f "$BUILD_TARGET/webview-$QT_VERSION-$DEBIAN_VERSION-$1-$GIT_HASH.tar.gz" ]; then - if [ "${BUILD_WEBVIEW-x}" == "1" ]; then - cp -rf /webview "$SRC_DIR/" + if [ "${BUILD_WEBVIEW-x}" == "1" ]; then + cp -rf /webview "$SRC_DIR/" - pushd "$SRC_DIR/webview" + pushd "$SRC_DIR/webview" - "$SRC_DIR/qt${QT_MAJOR}pi/bin/qmake" - make -j"$MAKE_CORES" - make install + "$SRC_DIR/qt${QT_MAJOR}pi/bin/qmake" + make -j"$MAKE_CORES" + make install - mkdir -p fakeroot/bin fakeroot/share/ScreenlyWebview - mv ScreenlyWebview fakeroot/bin/ - cp -rf /webview/res fakeroot/share/ScreenlyWebview/ + mkdir -p fakeroot/bin fakeroot/share/ScreenlyWebview + mv ScreenlyWebview fakeroot/bin/ + cp -rf /webview/res fakeroot/share/ScreenlyWebview/ - pushd fakeroot - tar cfz "$BUILD_TARGET/webview-$QT_VERSION-$DEBIAN_VERSION-$1-$GIT_HASH.tar.gz" . - popd + pushd fakeroot + tar cfz "$BUILD_TARGET/webview-$QT_VERSION-$DEBIAN_VERSION-$1.tar.gz" . + popd - pushd "$BUILD_TARGET" - sha256sum "webview-$QT_VERSION-$DEBIAN_VERSION-$1-$GIT_HASH.tar.gz" > "webview-$QT_VERSION-$DEBIAN_VERSION-$1-$GIT_HASH.tar.gz.sha256" - popd - fi - else - echo "Webview Build already exist." + pushd "$BUILD_TARGET" + sha256sum "webview-$QT_VERSION-$DEBIAN_VERSION-$1.tar.gz" > "webview-$QT_VERSION-$DEBIAN_VERSION-$1.tar.gz.sha256" + popd fi } @@ -274,7 +270,6 @@ function build_qt () { /usr/local/bin/sysroot-relativelinks.py /sysroot fetch_cross_compile_tool -fetch_rpi_firmware if [ ! "${TARGET-}" ]; then # Let's work our way through all Pis in order of relevance diff --git a/webview/src/main.cpp b/webview/src/main.cpp index 6a54df665..270f5d86d 100644 --- a/webview/src/main.cpp +++ b/webview/src/main.cpp @@ -4,12 +4,28 @@ #include #include +#include +#include + #include "mainwindow.h" int main(int argc, char *argv[]) { QApplication app(argc, argv); + qInstallMessageHandler([](QtMsgType type, const QMessageLogContext &context, const QString &msg) { + std::ofstream log; + log.open("/tmp/anthias-webview.log", std::ios::out | std::ios::app); + + if (log.fail()) { + std::cerr << "Failed to open log file" << std::endl; + return; + } + + log << msg.toStdString() << std::endl; + std::cout << msg.toStdString() << std::endl; + }); + QCursor cursor(Qt::BlankCursor); QApplication::setOverrideCursor(cursor); QApplication::changeOverrideCursor(cursor);