Merge branch 'release-1130' into HEAD

Author: hemiao2023

.gitignore

@@ -50,4 +50,15 @@ tagcmmid
 maxcmmid
 resources/i18n/*/*.*
 __pycache__
-/customized
+/customized
+/cmmid
+/docs/cmake_structure.md
+/docs/filament_parameters_validation.md
+/docs/gcode_output_post_process_notes_summary.md
+/docs/i18n_walkthrough.md
+/docs/learning_checklist.md
+/docs/learning_highlights.md
+/docs/multimaterial_others_validation_design.md
+/docs/printer_parameters_validation.md
+/docs/printer_settings_ui_parameters.md
+docs

BuildLinux.sh

@@ -22,7 +22,8 @@ function check_available_memory_and_disk() {
     FREE_DISK_KB=$(df -k . | tail -1 | awk '{print $4}')
     MIN_DISK_KB=$((10 * 1024 * 1024))
 
-    if [ ${FREE_MEM_GB} -le ${MIN_MEM_GB} ]; then
+   # if [ ${FREE_MEM_GB} -le ${MIN_MEM_GB} ]; then
+    if [ ${FREE_MEM_GB} -lt ${MIN_MEM_GB} ]; then
         echo -e "\nERROR: Orca Slicer Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
         echo && free -h && echo
         exit 2
@@ -43,15 +44,18 @@ function usage() {
     echo "   -d: build deps (optional)"
     echo "   -h: this help output"
     echo "   -i: Generate appimage (optional)"
+    echo "   -e: Generate deb package (optional)"
     echo "   -r: skip ram and disk checks (low ram compiling)"
     echo "   -s: build orca-slicer (optional)"
     echo "   -u: update and build dependencies (optional and need sudo)"
+    echo "   -jN: set number of threads for ninja build (e.g., -j4)"
     echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
     echo "   and then './BuildLinux.sh -dsi'"
 }
 
 unset name
-while getopts ":1bcdghirsu" opt; do
+unset NUM_THREADS
+while getopts ":1bcdghirsuej:" opt; do
   case ${opt} in
     1 )
         export CMAKE_BUILD_PARALLEL_LEVEL=1
@@ -71,6 +75,9 @@ while getopts ":1bcdghirsu" opt; do
     i )
         BUILD_IMAGE="1"
         ;;
+    e )
+        BUILD_DEB="1"
+        ;;
     r )
 	    SKIP_RAM_CHECK="1"
 	;;
@@ -80,6 +87,9 @@ while getopts ":1bcdghirsu" opt; do
     u )
         UPDATE_LIB="1"
         ;;
+    j )
+        NUM_THREADS=${OPTARG}
+	;;
   esac
 done
 
@@ -90,7 +100,9 @@ then
 fi
 
 DISTRIBUTION=$(awk -F= '/^ID=/ {print $2}' /etc/os-release)
-# treat ubuntu as debian
+# 规范化发行版ID（去引号并转小写）
+DISTRIBUTION=$(echo ${DISTRIBUTION} | tr -d '"' | tr '[:upper:]' '[:lower:]')
+# 将 ubuntu 视为 debian
 if [ "${DISTRIBUTION}" == "ubuntu" ]
 then
     DISTRIBUTION="debian"
@@ -103,6 +115,11 @@ then
         DISTRIBUTION="debian2"
     fi
 fi
+# 兼容麒麟系统（Kylin/openKylin），使用专用脚本
+if [ "${DISTRIBUTION}" == "kylin" ] || [ "${DISTRIBUTION}" == "openkylin" ]
+then
+    DISTRIBUTION="kylin"
+fi
 if [ ! -f ./linux.d/${DISTRIBUTION} ]
 then
     echo "Your distribution does not appear to be currently supported by these build scripts"
@@ -186,9 +203,13 @@ then
         ${BUILD_ARGS}
     echo "done"
     echo "Building CrealityPrint ..."
-    cmake --build build --target CrealityPrint
+    if [[ -n "${num_threads}" ]]; then
+        cmake --build build --target CrealityPrint -j${NUM_THREADS}
+    else
+        cmake --build build --target CrealityPrint
+    fi
     echo "Building CrealityPrint_profile_validator .."
-    cmake --build build --target CrealityPrint_profile_validator
+    #cmake --build build --target CrealityPrint_profile_validator
     ./run_gettext.sh
     echo "done"
 fi
@@ -205,6 +226,11 @@ echo "[9/9] Generating Linux app..."
         else
             ${ROOT}/build/src/BuildLinuxImage.sh
         fi
+        if [[ -n "${BUILD_DEB}" ]] && [[ -e ${ROOT}/build/src/BuildLinuxDeb.sh ]]
+        then
+            chmod 755 ${ROOT}/build/src/BuildLinuxDeb.sh
+            ${ROOT}/build/src/BuildLinuxDeb.sh
+        fi
     popd
 echo "done"
 fi

CMakeLists.txt

@@ -12,6 +12,7 @@ set(DUMPTOOL_USER $ENV{DUMPTOOL_USER})
 set(DUMPTOOL_PASS $ENV{DUMPTOOL_PASS})
 set(DUMPTOOL_HOST $ENV{DUMPTOOL_HOST})
 set(DUMPTOOL_TO $ENV{DUMPTOOL_TO})
+set(SLIC3R_BUILD_ID $ENV{BUILD_ID})
 if(CX_DEBUG)
   add_definitions(-D_DEBUG1=1)
 endif()

CMakePresets.json

@@ -47,7 +47,7 @@
             "description": "Sets release build type",
             "inherits": "x64-release",
             "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release",
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo",
                 "CMAKE_PREFIX_PATH": "${sourceDir}/deps/build/OrcaSlicer_dep/usr/local/",
                 "CX_DEBUG": "1",
                 "CMAKE_EXPORT_COMPILE_COMMANDS":"1",

ai_code_check/checkRule.md

@@ -0,0 +1,56 @@
+# 一、防止程序崩溃
+应重点识别和避免以下经典高风险问题：
+- 空指针引用（Null/Uninitialized Pointer Dereference）
+- 越界访问（数组/指针/迭代器/下标检查缺失）
+- 栈溢出（深递归、巨型栈对象、未控递归）
+- 重复释放/错误释放（Double Free、Use-After-Free、野指针）
+- 资源泄漏（内存、文件句柄、GDI、套接字等未释放）
+- 未初始化/未定义行为（UB：签名溢出、未设定初值使用）
+- 异常处理缺失/吞异常（异常未捕获导致崩溃或状态不一致）
+- 并发协同问题：
+  - 数据竞争（Data Race）与条件竞争（Race Condition）
+  - 死锁/活锁/优先级反转（锁顺序不一致、锁粒度过大）
+  - 非原子读写、内存可见性问题（缺少 `atomic`/内存栅栏）
+- 非法迭代器/游标使用（失效迭代器、迭代中修改容器导致崩溃）
+- 线程生命周期与资源管理混乱（线程未 Join/Detach，析构期仍在访问）
+- 跨平台/编译器差异导致的未定义行为（结构体对齐、字节序、宏差异）
+
+检查要点（建议）：
+- 对所有外部/系统/库调用检查返回值与错误码；失败路径应可控。
+- 关键路径执行边界检查与空值判断；减少隐式转换的风险。
+- 资源/内存采用 RAII 或智能指针管理（C++：`unique_ptr`/`shared_ptr`）。
+- 并发使用明确的锁顺序与细粒度锁；避免在锁内做长耗时操作。
+- 跨线程共享数据使用 `atomic` 或受控同步原语；避免裸共享可变状态。
+- 对递归或深调用栈设置安全边界或改为迭代；避免栈上巨型对象。
+- 统一异常策略：明确可抛/不可抛边界，避免跨模块未捕获异常。
+
+# 二、性能问题
+
+应重点识别以下常见性能陷阱：
+- 大循环中执行重/阻塞操作（磁盘/网络 IO、数据库访问、睡眠等待）
+- 频繁分配/释放内存或创建对象（导致碎片与 GC/分配器压力）
+- 重复计算/缺少缓存（相同结果未缓存、重复排序/查找/解析）
+- N+1 查询/逐项远程调用（可批量或预取的场景未合并）
+- 热路径中的昂贵日志/正则/JSON 解析/字符串拼接
+- 不合适的数据结构或复杂度（O(N^2)/嵌套循环可降维为 O(N log N)）
+- 锁竞争/串行化过多（大范围互斥导致吞吐下降）
+- 不必要的拷贝/深拷贝（可用移动语义/引用/视图替代）
+- 资源加载过大或频繁（图片/模型/视频流未做懒加载或复用）
+- 跨语言/跨进程边界调用过多（序列化/上下文切换开销显著）
+
+优化建议（方向）：
+- 用分析器（Profiler/火焰图）识别热点；先测量、再优化。
+- 在热路径使用缓存/预计算；避免重复解析与转换。
+- 选择合适数据结构与算法，关注时间/空间复杂度。
+- 降低锁粒度并提高并发度；必要时采用无锁或读写锁方案。
+- 批量化 IO/查询；异步化耗时操作并隔离 UI/主线程。
+- 合理控制日志等级与频度；避免在热路径进行重字符串操作。
+
+# 三、业务逻辑变更
+应重点识别重大业务逻辑变更
+- 比如修改判断条件，本来每个平台都要运行的代码被限定为单一平台才执行
+- 其他引起业务逻辑大变更的代码
+
+# 四、识别编译问题
+应重点识别可能引入编译告警，错误的问题
+- 引起新增编译报错的问题

cmake/modules/CheckUos.cmake

@@ -0,0 +1,36 @@
+# 综合检查方法
+if(UNIX AND NOT APPLE)
+    set(IS_UOS FALSE)
+    
+    # 检查 /etc/os-release
+    if(EXISTS "/etc/os-release")
+        file(READ "/etc/os-release" OS_RELEASE)
+        if(OS_RELEASE MATCHES "NAME=.*UOS" OR OS_RELEASE MATCHES "NAME=.*uos")
+            set(IS_UOS TRUE)
+        endif()
+    endif()
+    
+    # 检查 /etc/uos-release
+    if(EXISTS "/etc/uos-release")
+        set(IS_UOS TRUE)
+    endif()
+    
+    # 检查其他可能的标识
+    execute_process(
+        COMMAND lsb_release -i -s
+        OUTPUT_VARIABLE LSB_ID
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if(LSB_ID STREQUAL "UOS" OR LSB_ID STREQUAL "uos")
+        set(IS_UOS TRUE)
+    endif()
+else()
+    set(IS_UOS FALSE)
+endif()
+
+if(IS_UOS)
+    message(STATUS "检测到系统是统信 UOS")
+    # 添加 UOS 特定的配置选项
+else()
+    message(STATUS "当前系统不是统信 UOS")
+endif()

cmake/modules/DetectOS.cmake

@@ -0,0 +1,22 @@
+# function: detect os id
+# result: OUTPUT_VAR
+# usage eg: detect_os(OS_ID)   OS_ID may is uos/deepin/Ubuntu
+
+function(detect_os OUTPUT_VAR)
+    if(UNIX AND NOT APPLE)
+        if(EXISTS /etc/os-release)
+            file(STRINGS /etc/os-release os_release_lines)
+            set(os_id "")
+            foreach(line IN LISTS os_release_lines)
+                if(line MATCHES "^ID=(.*)$")
+                    set(os_id "${CMAKE_MATCH_1}")
+                endif()
+            endforeach()
+            set(${OUTPUT_VAR} "${os_id}" PARENT_SCOPE)
+        else()
+            set(${OUTPUT_VAR} "unknown" PARENT_SCOPE)
+        endif()
+    else()
+        set(${OUTPUT_VAR} "non-unix" PARENT_SCOPE)
+    endif()
+endfunction()

deps/Assimp/0001-uos.patch

@@ -0,0 +1,24 @@
+From 21139104a4e41c4abcf6a6ab57f02f32a8ed5008 Mon Sep 17 00:00:00 2001
+From: lisugui <lisugui@creatily.com>
+Date: Tue, 4 Nov 2025 14:43:31 +0800
+Subject: [PATCH] uos patch
+
+---
+ contrib/stb/stb_image.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/contrib/stb/stb_image.h b/contrib/stb/stb_image.h
+index a632d54..5594e60 100644
+--- a/contrib/stb/stb_image.h
++++ b/contrib/stb/stb_image.h
+@@ -827,6 +827,7 @@ static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len)
+    s->io.read = NULL;
+    s->read_from_callbacks = 0;
+    s->callback_already_read = 0;
++   s->buflen = sizeof(s->buffer_start);
+    s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer;
+    s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len;
+ }
+-- 
+2.20.1
+

deps/Assimp/Assimp.cmake

@@ -1,4 +1,9 @@
-set(patch_command git init && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-.patch)
+include(${CMAKE_SOURCE_DIR}/../cmake/modules/CheckUos.cmake)
+if(IS_UOS)
+    set(patch_command git init && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-.patch && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-uos.patch)
+else()
+    set(patch_command git init && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-.patch)
+endif()
 orcaslicer_add_cmake_project(Assimp
   URL                 https://github.com/assimp/assimp/archive/refs/tags/v5.4.3.zip
   URL_HASH            SHA256=795C29716F4AC123B403E53B677E9F32A8605C4A7B2D9904BFAAE3F4053B506D
@@ -11,4 +16,4 @@ orcaslicer_add_cmake_project(Assimp
 #add_dependencies(dep_ZLIB)
 if (MSVC)
     add_debug_dep(dep_Assimp)
-endif ()
+endif ()

deps/CMakeLists.txt

@@ -425,6 +425,13 @@ endif()
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	list(APPEND _dep_list "dep_metartc")
 endif()
+
+if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "loongarch|loongarch64")
+    # TODO: Only the rules of uos/deepin under the Loongson architecture
+    list(REMOVE_ITEM _dep_list dep_BREAKPAD)
+endif()
+
+
 if (MSVC)
     # Experimental
     #list(APPEND _dep_list "dep_qhull")
@@ -440,7 +447,17 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     include(ZSTD/ZSTD.cmake)
     list(APPEND _dep_list_first "dep_zstd")
 endif()
+# Include LERC for UOS or LoongArch systems
+include(${CMAKE_SOURCE_DIR}/../cmake/modules/CheckUos.cmake)
+if(IS_UOS OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "loongarch")
+    include(LERC/lerc.cmake)
+    if(LERC_FOUND)
+        list(APPEND _dep_list_first "dep_Lerc")
+    endif()
+endif()
 add_custom_target(deps ALL DEPENDS ${_dep_list_first} ${_dep_list} ${_dep_cr_tpms}  )
 
+
+
 # Note: I'm not using any of the LOG_xxx options in ExternalProject_Add() commands
 # because they seem to generate bogus build files (possibly a bug in ExternalProject).