Merge mainstream changes

BuildLinux.sh

@@ -0,0 +1,227 @@
+#!/bin/bash
+set -e # exit on first error
+
+export ROOT=`pwd`
+export NCORES=`nproc --all`
+FOUND_GTK2=$(dpkg -l libgtk* | grep gtk2)
+FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
+
+unset name
+while getopts ":dsiuhgb" opt; do
+  case ${opt} in
+    u )
+        UPDATE_LIB="1"
+        ;;
+    i )
+        BUILD_IMAGE="1"
+        ;;
+    d )
+        BUILD_DEPS="1"
+        ;;
+    s )
+        BUILD_BAMBU_STUDIO="1"
+        ;;
+    b )
+        BUILD_DEBUG="1"
+        ;;
+    g )
+        FOUND_GTK3=""
+        ;;
+    h ) echo "Usage: ./BuildLinux.sh [-i][-u][-d][-s][-b][-g]"
+        echo "   -i: Generate appimage (optional)"
+        echo "   -g: force gtk2 build"
+        echo "   -b: build in debug mode"
+        echo "   -d: build deps (optional)"
+        echo "   -s: build bambu-studio (optional)"
+        echo "   -u: only update clock & dependency packets (optional and need sudo)"
+        echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
+        echo "   and then './BuildLinux.sh -dsi'"
+        exit 0
+        ;;
+  esac
+done
+
+if [ $OPTIND -eq 1 ]
+then
+    echo "Usage: ./BuildLinux.sh [-i][-u][-d][-s][-b][-g]"
+    echo "   -i: Generate appimage (optional)"
+    echo "   -g: force gtk2 build"
+    echo "   -b: build in debug mode"
+    echo "   -d: build deps (optional)"
+    echo "   -s: build bambu-studio (optional)"
+    echo "   -u: only update clock & dependency packets (optional and need sudo)"
+    echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
+    echo "   and then './BuildLinux.sh -dsi'"
+    exit 0
+fi
+
+# mkdir build
+if [ ! -d "build" ]
+then
+    mkdir build
+fi
+
+# Addtional Dev packages for BambuStudio
+export REQUIRED_DEV_PACKAGES="libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules"
+# libwebkit2gtk-4.1-dev ??
+export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w)
+if [ $(dpkg --get-selections | grep -E "$(echo ${REQUIRED_DEV_PACKAGES} | tr ' ' '|')" | wc -l) -lt ${DEV_PACKAGES_COUNT} ]; then
+    sudo apt install -y ${REQUIRED_DEV_PACKAGES} git cmake wget file
+fi
+
+#FIXME: require root for -u option
+if [[ -n "$UPDATE_LIB" ]]
+then
+    echo -n -e "Updating linux ...\n"
+    # hwclock -s # DeftDawg: Why does SuperSlicer want to do this?
+    apt update
+    if [[ -z "$FOUND_GTK3" ]]
+    then
+        echo -e "\nInstalling: libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n"
+        apt install -y libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git
+    else
+        echo -e "\nFind libgtk-3, installing: libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n"
+        apt install -y libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git
+    fi
+    # for ubuntu 22.04:
+    ubu_version="$(cat /etc/issue)" 
+    if [[ $ubu_version == "Ubuntu 22.04"* ]]
+    then
+        apt install -y curl libssl-dev libcurl4-openssl-dev m4
+    fi
+    if [[ -n "$BUILD_DEBUG" ]]
+    then
+        echo -e "\nInstalling: libssl-dev libcurl4-openssl-dev\n"
+        apt install -y libssl-dev libcurl4-openssl-dev
+    fi
+    echo -e "done\n"
+    exit 0
+fi
+
+FOUND_GTK2_DEV=$(dpkg -l libgtk* | grep gtk2.0-dev || echo '')
+FOUND_GTK3_DEV=$(dpkg -l libgtk* | grep gtk-3-dev || echo '')
+echo "FOUND_GTK2=$FOUND_GTK2)"
+if [[ -z "$FOUND_GTK2_DEV" ]]
+then
+if [[ -z "$FOUND_GTK3_DEV" ]]
+then
+    echo "Error, you must install the dependencies before."
+    echo "Use option -u with sudo"
+    exit 0
+fi
+fi
+
+echo "[1/9] Updating submodules..."
+{
+    # update submodule profiles
+    pushd resources/profiles
+    git submodule update --init
+    popd
+}
+
+echo "[2/9] Changing date in version..."
+{
+    # change date in version
+    sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
+}
+echo "done"
+
+# mkdir in deps
+if [ ! -d "deps/build" ]
+then
+    mkdir deps/build
+fi
+
+if [[ -n "$BUILD_DEPS" ]]
+then
+    echo "[3/9] Configuring dependencies..."
+    BUILD_ARGS=""
+    if [[ -n "$FOUND_GTK3_DEV" ]]
+    then
+        BUILD_ARGS="-DDEP_WX_GTK3=ON"
+    fi
+    if [[ -n "$BUILD_DEBUG" ]]
+    then
+        # have to build deps with debug & release or the cmake won't find evrything it needs
+        mkdir deps/build/release
+        pushd deps/build/release
+            cmake ../.. -DDESTDIR="../destdir" $BUILD_ARGS
+            make -j$NCORES
+        popd
+        BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug"
+    fi
+
+    # cmake deps
+    pushd deps/build
+        cmake .. $BUILD_ARGS
+        echo "done"
+
+        # make deps
+        echo "[4/9] Building dependencies..."
+        make -j$NCORES
+        echo "done"
+
+        # rename wxscintilla # TODO: DeftDawg: Does BambuStudio need this?
+        # echo "[5/9] Renaming wxscintilla library..."
+        # pushd destdir/usr/local/lib
+        #     if [[ -z "$FOUND_GTK3_DEV" ]]
+        #     then
+        #         cp libwxscintilla-3.1.a libwx_gtk2u_scintilla-3.1.a
+        #     else
+        #         cp libwxscintilla-3.1.a libwx_gtk3u_scintilla-3.1.a
+        #     fi
+        # popd
+        # echo "done"
+
+        # FIXME: only clean deps if compiling succeeds; otherwise reruns waste tonnes of time!
+        # clean deps
+        # echo "[6/9] Cleaning dependencies..."
+        # rm -rf dep_*
+    popd
+    echo "done"
+fi
+
+if [[ -n "$BUILD_BAMBU_STUDIO" ]]
+then
+    echo "[7/9] Configuring Slic3r..."
+    BUILD_ARGS=""
+    if [[ -n "$FOUND_GTK3_DEV" ]]
+    then
+        BUILD_ARGS="-DSLIC3R_GTK=3"
+    fi
+    if [[ -n "$BUILD_DEBUG" ]]
+    then
+        BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug"
+    fi
+
+    # cmake
+    pushd build
+        cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 ${BUILD_ARGS}
+        echo "done"
+
+        # make Slic3r
+        echo "[8/9] Building Slic3r..."
+        make -j$NCORES BambuStudio # Slic3r
+
+        # make .mo
+        # make gettext_po_to_mo # FIXME: DeftDawg: complains about msgfmt not existing even in SuperSlicer, did this ever work?
+
+    popd
+    echo "done"
+fi
+
+if [[ -e $ROOT/build/src/BuildLinuxImage.sh ]]; then
+# Give proper permissions to script
+chmod 755 $ROOT/build/src/BuildLinuxImage.sh
+
+echo "[9/9] Generating Linux app..."
+    pushd build
+        if [[ -n "$BUILD_IMAGE" ]]
+        then
+            $ROOT/build/src/BuildLinuxImage.sh -i
+        else
+            $ROOT/build/src/BuildLinuxImage.sh
+        fi
+    popd
+echo "done"
+fi

CMakeLists.txt

@@ -675,6 +675,11 @@ if(SLIC3R_BUILD_TESTS)
     add_subdirectory(tests)
 endif()
 
+if (NOT WIN32 AND NOT APPLE)
+    set(SLIC3R_APP_CMD "bambu-studio")
+    configure_file(${LIBDIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY)
+endif()
+
 option(BUILD_BBS_TEST_TOOLS          "Build bbs test tools" OFF)
 if(BUILD_BBS_TEST_TOOLS)
     add_subdirectory(bbs_test_tools)

Containerfile

@@ -0,0 +1,44 @@
+# Build Bambu Slicer in a container
+#
+# Build an AppImage:
+# rm -rf build; sudo podman build .. -t bambu-studio  &&  sudo podman run --rm localhost/bambu-studio /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
+#
+# Troubleshooting:
+# sudo podman run -it localhost/bambu-studio /bin/bash
+
+FROM docker.io/ubuntu:kinetic
+LABEL maintainer "DeftDawg <[email protected]>"
+
+# Add a deb-src
+RUN echo deb-src http://archive.ubuntu.com/ubuntu \
+    $(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) main universe>> /etc/apt/sources.list 
+
+RUN apt-get update && apt-get install  -y \
+    git \
+    build-essential \
+    autoconf \
+    cmake \
+    libglu1-mesa-dev \
+    libgtk-3-dev \
+    libdbus-1-dev \
+    curl \
+    wget \
+    sudo
+
+COPY ../BambuStudio BambuStudio
+
+WORKDIR BambuStudio
+
+# These can run together, but we run them seperate for podman caching
+# Update System dependencies
+RUN ./BuildLinux.sh -u
+
+# Build dependencies in ./deps
+RUN ./BuildLinux.sh -d
+
+# Build slic3r
+RUN ./BuildLinux.sh -s
+
+# Build AppImage
+ENV container podman
+RUN ./BuildLinux.sh -i