Merge branch 'openscad:master' into master

Author: gsohler

.circleci/config.yml

@@ -71,7 +71,9 @@ jobs:
               cd ..
               export PATH=/appimage/usr/bin:"$PATH"
               export EXTRA_QT_PLUGINS=svg
-              LINUXDEPLOY_OUTPUT_VERSION="${OPENSCAD_VERSION}${SUFFIX}" linuxdeploy --plugin python --plugin qt --output appimage --appdir AppDir
+              export PYTHON_VERSION=$(python3 -c "import sys; v=sys.version_info; print(f'{v.major}.{v.minor}.{v.micro}')")
+              export LINUXDEPLOY_OUTPUT_VERSION="${OPENSCAD_VERSION}${SUFFIX}"
+              linuxdeploy --plugin python --plugin qt --output appimage --appdir AppDir
               mkdir -p /tmp/out
               cp -iv OpenSCAD-*.AppImage /tmp/out
               if [ -n "${CODE_SIGNING_KEY}" ]; then

.github/workflows/macos-tests.yml

@@ -5,6 +5,13 @@ on:
     branches:
       - master
   pull_request:
+  workflow_dispatch:
+    inputs:
+      debug_enabled:
+        type: boolean
+        description: 'Run the build with ssh debugging enabled'
+        required: false
+        default: false
 
 jobs:
   build_and_test:
@@ -15,6 +22,9 @@ jobs:
         exclude:
           # macos-latest runs on arm64, which has a broken SW renderer
           - os: macos-latest
+          # QScintilla for qt5 is not longer available on Homebrew, and
+          # it's too much work to keep that running.
+          - qt: qt5
     runs-on:  ${{ matrix.os }}
     name: ${{ matrix.os }} ${{ matrix.qt }}
     # If it's not done in 60 minutes, something is wrong.
@@ -30,6 +40,17 @@ jobs:
       uses: actions/checkout@v4
       with:
         submodules: 'recursive'
+    - name: Setup (detached) tmate ssh session if enabled
+      if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+      uses: mxschmitt/action-tmate@v3
+      timeout-minutes: 15
+      with:
+        detached: true
+        limit-access-to-actor: true
+    - name: Install CMake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: 3.31.6
     - name: Set up Python
       uses: actions/setup-python@v5
       with:

.gitmodules

@@ -12,7 +12,7 @@
 	url = https://github.com/arsenm/sanitizers-cmake.git
 [submodule "OpenCSG"]
 	path = submodules/OpenCSG
-	url = https://github.com/openscad/OpenCSG.git
+	url = https://github.com/floriankirsch/OpenCSG.git
 [submodule "Clipper2"]
 	path = submodules/Clipper2
 	url = https://github.com/AngusJohnson/Clipper2.git

CMakeLists.txt

@@ -470,11 +470,12 @@ if(ENABLE_PYTHON)
     message(WARNING "Nettle not found, disabling python support.")
     set(ENABLE_PYTHON OFF CACHE BOOL "" FORCE)
   else()
-    message(STATUS "Python enabled, using Nettle ${Nettle_VERSION}")
+    message(STATUS "Python ${Python_VERSION} enabled, using Nettle ${Nettle_VERSION}")
     target_include_directories(OpenSCAD PRIVATE ${Python_INCLUDE_DIRS})
     target_link_libraries(OpenSCAD PRIVATE ${Python_LIBRARIES})
     target_include_directories(OpenSCAD PRIVATE ${Nettle_INCLUDE_DIRS})
     target_link_libraries(OpenSCAD PRIVATE ${Nettle_LIBRARIES})
+    add_custom_target(OpenSCADPython ALL COMMAND ${CMAKE_COMMAND} -E create_symlink openscad${SUFFIX_WITH_DASH} "openscad-python")
   endif()
 endif()
 
@@ -845,6 +846,7 @@ set(CORE_SOURCES
   src/geometry/boolean_utils.cc
   src/geometry/linalg.cc
   src/geometry/linear_extrude.cc
+  src/geometry/rotate_extrude.cc
   src/glview/Camera.cc
   src/glview/ColorMap.cc
   src/glview/OffscreenContextFactory.cc
@@ -906,6 +908,7 @@ set(CORE_SOURCES
   ${BISON_comment_parser_OUTPUTS})
 if(ENABLE_PYTHON)
 	list(APPEND CORE_SOURCES
+		    src/python/pymod.cc
 		    src/python/pyopenscad.cc 
 		    src/python/pyfunctions.cc )
 	target_compile_definitions(OpenSCAD PRIVATE ENABLE_PYTHON)
@@ -1074,9 +1077,11 @@ set(GUI_SOURCES
   src/gui/EventFilter.h
   src/gui/Export3mfDialog.cc
   src/gui/ExportPdfDialog.cc
+  src/gui/OctoPrintApiKeyDialog.cc
   src/gui/FontListDialog.cc
   src/gui/FontListTableView.cc
   src/gui/InitConfigurator.cc
+  src/gui/ImportUtils.cc
   src/gui/LaunchingScreen.cc
   src/gui/LibraryInfoDialog.cc
   src/gui/MainWindow.cc
@@ -1142,10 +1147,12 @@ set(GUI_HEADERS
     src/gui/EventFilter.h
     src/gui/Export3mfDialog.h
     src/gui/ExportPdfDialog.h
+    src/gui/OctoPrintApiKeyDialog.h
     src/gui/FontList.h
     src/gui/FontListDialog.h
     src/gui/FontListTableView.h
     src/gui/IgnoreWheelWhenNotFocused.h
+    src/gui/ImportUtils.h
     src/gui/InitConfigurator.h
     src/gui/LaunchingScreen.h
     src/gui/LibraryInfoDialog.h
@@ -1195,6 +1202,7 @@ set(GUI_UIS
     src/gui/ErrorLog.ui
     src/gui/Export3mfDialog.ui
     src/gui/ExportPdfDialog.ui
+    src/gui/OctoPrintApiKeyDialog.ui
     src/gui/FontList.ui
     src/gui/FontListDialog.ui
     src/gui/LaunchingScreen.ui
@@ -1372,6 +1380,9 @@ endif()
 if(NOT APPLE OR APPLE_UNIX)
   set_target_properties(OpenSCAD PROPERTIES OUTPUT_NAME openscad${SUFFIX_WITH_DASH})
   install(TARGETS OpenSCAD RUNTIME DESTINATION "${OPENSCAD_BINDIR}")
+  if(ENABLE_PYTHON)
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/openscad-python DESTINATION "${OPENSCAD_BINDIR}")
+  endif()
   if(WIN32)
     if(USE_MIMALLOC AND MI_LINK_SHARED)
       if(CMAKE_SIZEOF_VOID_P EQUAL 8)

cmake/Modules/info.cmake

@@ -23,6 +23,11 @@ elseif(UNIX)
 else()
   message(STATUS "Environment: Unknown")
 endif()
+if (ENABLE_PYTHON)
+  message(STATUS "Python: ${Python_VERSION}")
+else()
+  message(STATUS "Python: disabled")
+endif()
 message(STATUS " ")
 message(STATUS "CMAKE_VERSION:         ${CMAKE_VERSION}")
 message(STATUS "CMAKE_TOOLCHAIN_FILE:  ${CMAKE_TOOLCHAIN_FILE}")

examples/Advanced/example-dir.json

@@ -0,0 +1,3 @@
+{
+	"sort": 1020
+}

examples/Basics/example-dir.json

@@ -0,0 +1,3 @@
+{
+	"sort": 1000
+}

examples/Functions/example-dir.json

@@ -0,0 +1,3 @@
+{
+	"sort": 1010
+}

examples/Parametric/example-dir.json

@@ -0,0 +1,3 @@
+{
+	"sort": 1030
+}