Merge branch 'main' into feat/plugin-storage-api

CMakeLists.txt

@@ -853,6 +853,7 @@ foreach(po_file ${BBL_L10N_PO_FILES})
     add_custom_command(
         TARGET gettext_merge_po_with_pot PRE_BUILD
         COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/OrcaSlicer.pot"
+        DEPENDS ${po_file}
     )
 endforeach()
 add_custom_target(gettext_po_to_mo
@@ -868,6 +869,7 @@ foreach(po_file ${BBL_L10N_PO_FILES})
         TARGET gettext_po_to_mo PRE_BUILD
         COMMAND msgfmt ARGS --check-format -o ${mo_file} ${po_file}
         #COMMAND msgfmt ARGS --check-compatibility -o ${mo_file} ${po_file}
+        DEPENDS ${po_file}
     )
 endforeach()
 

cmake/modules/FindOpenVDB.cmake

@@ -128,10 +128,6 @@ cmake_minimum_required(VERSION 3.13)
 if(POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
 endif()
-# Re-set after cmake_minimum_required above cleared it; use BoostConfig, not the removed FindBoost.
-if(POLICY CMP0167)
-  cmake_policy(SET CMP0167 NEW)
-endif()
 
 if(OpenVDB_FIND_QUIETLY)
   set (_quiet "QUIET")

src/CMakeLists.txt

@@ -283,6 +283,10 @@ else ()
             COMMAND ln -sf OrcaSlicer orca-slicer
             WORKING_DIRECTORY "$<TARGET_FILE_DIR:OrcaSlicer>"
             VERBATIM)
+    else ()
+        add_custom_command(TARGET OrcaSlicer POST_BUILD
+            WORKING_DIRECTORY "$<TARGET_FILE_DIR:OrcaSlicer>"
+            VERBATIM)
     endif ()
     if (XCODE)
         # Because of Debug/Release/etc. configurations (similar to MSVC) the slic3r binary is located in an extra level

src/libslic3r/CMakeLists.txt

@@ -19,7 +19,6 @@ if (TARGET OpenVDB::openvdb)
 endif()
 
 option(BUILD_SHARED_LIBS "Build shared libs" OFF)
-option(USE_SLIC3R_CONSOLE_LOG "Enable console logging in RelWithDebInfo builds" OFF)
 
 set(lisbslic3r_sources
     AABBMesh.cpp
@@ -498,12 +497,8 @@ set(CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE ON CACHE BOOL "" FORCE)
 
 cmake_policy(PUSH)
 cmake_policy(SET CMP0011 NEW)
-# CGAL's config resets policies (cmake_minimum_required ...3.23), so a plain SET
-# can't reach it; the default opts its Boost lookup into BoostConfig (CMP0167).
-set(CMAKE_POLICY_DEFAULT_CMP0167 NEW)
 find_package(CGAL REQUIRED)
 find_package(OpenCV REQUIRED core)
-unset(CMAKE_POLICY_DEFAULT_CMP0167)
 cmake_policy(POP)
 
 add_library(libslic3r_cgal STATIC
@@ -540,9 +535,7 @@ endif ()
 encoding_check(libslic3r)
 
 target_compile_definitions(libslic3r PUBLIC -DUSE_TBB -DTBB_USE_CAPTURED_EXCEPTION=0)
-if (USE_SLIC3R_CONSOLE_LOG)
-    target_compile_definitions(libslic3r PRIVATE $<$<CONFIG:RelWithDebInfo>:SLIC3R_CONSOLE_LOG>)
-endif()
+target_compile_definitions(libslic3r PRIVATE $<$<CONFIG:RelWithDebInfo>:SLIC3R_CONSOLE_LOG>)
 target_include_directories(libslic3r PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 target_include_directories(libslic3r SYSTEM PUBLIC ${EXPAT_INCLUDE_DIRS})
 
@@ -552,7 +545,7 @@ find_package(OpenCASCADE REQUIRED)
 target_include_directories(libslic3r SYSTEM PUBLIC ${OpenCASCADE_INCLUDE_DIR})
 
 find_package(JPEG REQUIRED)
-find_package(Draco REQUIRED)
+find_package(draco REQUIRED)
 
 set(OCCT_LIBS
     TKXDESTEP

src/slic3r/plugin/host/PluginHost.cpp

@@ -1,9 +1,59 @@
 #include "PluginHost.hpp"
 #include "PluginHostBindings.hpp"
 #include "PluginHostUi.hpp"
+#include <slic3r/plugin/PluginAuditManager.hpp>
+#include <slic3r/plugin/PluginDescriptor.hpp>
+#include <slic3r/plugin/PluginFsUtils.hpp>
+#include <slic3r/plugin/PluginManager.hpp>
+#include <slic3r/GUI/GUI_App.hpp>
+
+#include <stdexcept>
 
 namespace Slic3r {
 
+namespace host_bindings {
+void register_plugin(pybind11::module_& host)
+{
+    auto plugin_host = host.def_submodule("plugin", "Plugin host API");
+
+    plugin_host.def(
+        "storage",
+        []() -> std::string {
+            const std::string plugin_key = PluginAuditManager::instance().current_plugin();
+            if (plugin_key.empty())
+                throw std::runtime_error("plugin.storage() must be called from a plugin callback");
+
+            PluginDescriptor descriptor;
+            if (!PluginManager::instance().try_get_plugin_descriptor(plugin_key, descriptor))
+                throw std::runtime_error("The current plugin is not registered");
+
+            // plugin_root is populated for installed packages. If it is unavailable, the entry
+            // path still identifies the same package directory. This is important for local
+            // plugins: their directory is based on the source filename (including its extension),
+            // while plugin_key is based on the filename stem.
+            const boost::filesystem::path plugin_root = resolve_plugin_root_from_descriptor(descriptor);
+            if (!plugin_root.empty())
+                return plugin_root.string();
+
+            if (!descriptor.is_cloud_plugin())
+                throw std::runtime_error("The current local plugin folder is unavailable");
+
+            if (wxTheApp == nullptr || GUI::wxGetApp().getAgent() == nullptr)
+                throw std::runtime_error("Cloud plugin storage is unavailable before networking is initialized");
+
+            const std::string user_id = GUI::wxGetApp().getAgent()->get_user_id();
+            if (user_id.empty())
+                throw std::runtime_error("Cloud plugin storage is unavailable without a logged-in user");
+
+            if (!is_valid_plugin_id(plugin_key))
+                throw std::runtime_error("The current cloud plugin key is not a valid folder name");
+
+            return (boost::filesystem::path(get_cloud_plugin_dir(user_id)) / plugin_key).string();
+        },
+        "Return the installed folder of the current plugin.");
+}
+} // namespace host_bindings
+
 void PluginHost::RegisterBindings(pybind11::module_& module)
 {
     auto host = module.def_submodule("host", "Host application API");
@@ -15,6 +65,7 @@ void PluginHost::RegisterBindings(pybind11::module_& module)
     host_bindings::register_presets(host);
     host_bindings::register_model(host);
     host_bindings::register_app(host);
+    host_bindings::register_plugin(host);
 
     // UI: native dialogs and interactive HTML windows for plugins.
     PluginHostUi::RegisterBindings(host);

src/slic3r/plugin/host/PluginHostBindings.hpp

@@ -12,5 +12,5 @@ void register_presets(pybind11::module_& host);  // PluginHostPresets.cpp
 void register_model(pybind11::module_& host);    // PluginHostModel.cpp
 void register_app(pybind11::module_& host);      // PluginHostApp.cpp
 void register_slicing(pybind11::module_& host);  // PluginHostSlicing.cpp
-
+void register_plugin(pybind11::module_& host);  // PluginHost.cpp
 } // namespace Slic3r::host_bindings