Rework native library (#237)

Author: markaren

pythonfmu/_version.py

@@ -1 +1 @@
-__version__ = "0.6.7"
+__version__ = "0.6.8"

pythonfmu/fmi2slave.py

@@ -308,23 +308,26 @@ def _get_log_queue(self):
         return self.log_queue
 
     def log(
-        self,
-        msg: str,
-        status: Fmi2Status = Fmi2Status.ok,
-        category: Optional[str] = None,
-        debug: bool = False
+            self,
+            msg: str,
+            status: Fmi2Status = Fmi2Status.ok,
+            category: Optional[str] = None,
+            debug=None
     ):
         """Log a message to the FMU logger.
         
         Args:
             msg (str) : Log message
             status (Fmi2Status) : Optional, message status (default ok)
             category (str or None) : Optional, message category (default derived from status)
-            debug (bool) : Optional, is this a debug message (default False)
+            debug (bool) : Deprecated (has no effect)
         """
+        if debug is not None:
+            print(f"WARNING: 'debug' argument is deprecated and has no effect.")
+
         if category is None:
             category = f"logStatus{status.name.capitalize()}"
             if category not in self.log_categories:
                 category = "logAll"
-        log_msg = LogMsg(status, category, msg, debug)
+        log_msg = LogMsg(status, category, msg)
         self.log_queue.append(log_msg)

pythonfmu/logmsg.py

@@ -1,14 +1,13 @@
 
 class LogMsg:
 
-    def __init__(self, status: int, category: str, msg: str, debug: bool):
+    def __init__(self, status: int, category: str, msg: str):
         self.status = status
         self.category = category
         self.msg = msg
-        self.debug = debug
 
     def __str__(self) -> str:
-        return "LogMsg(status={}, category={}, msg={}, debug={}".format(self.status, self.category, self.msg, self.debug)
+        return "LogMsg(status={}, category={}, msg={}".format(self.status, self.category, self.msg)
 
 
 

pythonfmu/pythonfmu-export/src/CMakeLists.txt

@@ -1,20 +1,20 @@
 
 set(headers
-        cppfmu/cppfmu_cs.hpp
-        cppfmu/cppfmu_common.hpp
 
-        fmi/fmi2Functions.h
-        fmi/fmi2FunctionTypes.h
-        fmi/fmi2TypesPlatform.h
+        "fmi/fmi2Functions.h"
+        "fmi/fmi2FunctionTypes.h"
+        "fmi/fmi2TypesPlatform.h"
 
-        pythonfmu/PySlaveInstance.hpp
-        pythonfmu/PyState.hpp
+        "pythonfmu/fmu_except.hpp"
+        "pythonfmu/Logger.hpp"
+
+        "pythonfmu/SlaveInstance.hpp"
+        "pythonfmu/PyState.hpp"
         )
 
 set(sources
-        cppfmu/cppfmu_cs.cpp
-        cppfmu/fmi_functions.cpp
-        pythonfmu/PySlaveInstance.cpp
+        "pythonfmu/fmi2.cpp"
+        "pythonfmu/PySlaveInstance.cpp"
         )
 
 add_library(pythonfmu-export ${sources} ${headers})