remove xerces validator from OMSimulator (#1543)

* update 3rdParty

Author: arun3688

3rdParty

@@ -60,9 +60,7 @@ set(OMSIMULATORLIB_SOURCES
       SystemSC.cpp
       SystemWC.cpp
       Values.cpp
-      Variable.cpp
-      whereami.c
-      XercesValidator.cpp)
+      Variable.cpp)
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/Version.cpp" @ONLY)
 list(APPEND OMSIMULATORLIB_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/Version.cpp")
@@ -84,7 +82,6 @@ target_link_libraries(OMSimulatorLib
                           oms::3rd::lua
                           oms::3rd::pugixml::header
                           oms::3rd::json::header
-                          oms::3rd::xerces
                           oms::3rd::ctpl::header)
 
 target_link_libraries(OMSimulatorLib PUBLIC ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
@@ -116,7 +113,6 @@ target_link_libraries(OMSimulatorLib_static
                           oms::3rd::lua
                           oms::3rd::pugixml::header
                           oms::3rd::json::header
-                          oms::3rd::xerces
                           oms::3rd::ctpl::header)
 
 target_link_libraries(OMSimulatorLib_static PUBLIC ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
@@ -126,27 +122,27 @@ if(MINGW)
 endif()
 
 ## copy dependent DLL's for mingw artifacts
-if(ICU_FOUND)
-  message(STATUS "ICU_LIBRARIES_FOUND: ${ICU_LIBRARIES}")
-  if (MINGW)
-    list(GET ICU_LIBRARIES 0 ICU_PATH)
-    get_filename_component(DLL_DIR "${ICU_PATH}/../../bin" ABSOLUTE)
-    message(STATUS "DLL_DIR: ${DLL_DIR}")
-    # collect all DLLs matching the pattern
-    file(GLOB DLL_LIST
-              "${DLL_DIR}/libicuuc*.dll"
-              "${DLL_DIR}/libicudt*.dll"
-              "${DLL_DIR}/libstdc++*.dll"
-              "${DLL_DIR}/libwinpthread*.dll"
-              "${DLL_DIR}/libgcc_*.dll")
-    # Check if the DLL_LIST is not empty before installing
-    if (DLL_LIST)
-      # Install the files from the list to the 'bin' directory
-      install(FILES ${DLL_LIST} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-      message(STATUS "Copied files from: ${DLL_LIST} to ${CMAKE_INSTALL_PREFIX}/bin")
-    else()
-      message(WARNING "No DLLs found matching the pattern")
-    endif()
+if (MINGW)
+  # Extract compiler path (g++ path)
+  get_filename_component(COMPILER_DIR "${CMAKE_CXX_COMPILER}" DIRECTORY)
+
+  # MinGW DLLs are usually in the same directory
+  set(MINGW_BIN_DIR "${COMPILER_DIR}")
+
+  message(STATUS "Detected MinGW bin directory: ${MINGW_BIN_DIR}")
+
+  file(GLOB DLL_LIST
+        "${MINGW_BIN_DIR}/libstdc++*.dll"
+        "${MINGW_BIN_DIR}/libwinpthread*.dll"
+        "${MINGW_BIN_DIR}/libgcc_*.dll"
+  )
+  # Check if the DLL_LIST is not empty before installing
+  if (DLL_LIST)
+    # Install the files from the list to the 'bin' directory
+    install(FILES ${DLL_LIST} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+    message(STATUS "Copied files from: ${DLL_LIST} to ${CMAKE_INSTALL_PREFIX}/bin")
+  else()
+    message(WARNING "No DLLs found matching the pattern")
   endif()
 endif()
 

src/OMSimulatorLib/CMakeLists.txt

@@ -30,7 +30,6 @@
  */
 
 #include "Scope.h"
-#include "XercesValidator.h"
 #include "Flags.h"
 #include "System.h"
 #include "Component.h"
@@ -197,9 +196,6 @@ oms_status_enu_t oms::Scope::importModel(const std::string& filename, char** _cr
   if (!systemStructure)
     return logError("failed to extract \"SystemStructure.ssd\" from \"" + std::string(filename) + "\"");
 
-  XercesValidator xercesValidator;
-  xercesValidator.validateSSP(systemStructure, filename);
-
   Snapshot snapshot;
   oms_status_enu_t status = snapshot.importResourceMemory("SystemStructure.ssd", systemStructure);
   ::miniunz_free(systemStructure);

src/OMSimulatorLib/Scope.cpp

@@ -35,7 +35,6 @@
 #include "Logging.h"
 #include "ssd/Tags.h"
 #include "Util.h"
-#include "XercesValidator.h"
 
 #include <iostream>
 #include <map>
@@ -865,14 +864,6 @@ oms_status_enu_t oms::Values::importFromSnapshot(const pugi::xml_node& node, con
     std::string ssvFile = parameterBindingNode.attribute("source").as_string();
     if (!ssvFile.empty()) // parameter binding provided with .ssv file
     {
-      // validate ssv files against SSP schem, only if the file exists, because it is possible we use importSnapShot API
-      // to go back to old states and in this case we should not validate those ssv files in memory until it is exported to a ssp
-      if (filesystem::exists(ssvFile))
-      {
-        XercesValidator xercesValidator;
-        xercesValidator.validateSSP("", ssvFile);
-      }
-
       //resourceFiles.push_back(ssvFile);
       pugi::xml_node parameterSet = snapshot.getResourceNode(ssvFile);
       if (!parameterSet)
@@ -889,12 +880,6 @@ oms_status_enu_t oms::Values::importFromSnapshot(const pugi::xml_node& node, con
         std::string ssmFileSource = ssd_parameterMapping.attribute("source").as_string();
         if (!ssmFileSource.empty())
         {
-          // validate ssm file only if it exists
-          if (filesystem::exists(ssmFileSource))
-          {
-            XercesValidator xercesValidator;
-            xercesValidator.validateSSP("", ssmFileSource);
-          }
           pugi::xml_node ssm_parameterMapping = snapshot.getResourceNode(ssmFileSource);
           if (!ssm_parameterMapping)
             return logError("loading <oms:file> \"" + ssmFileSource + "\" from <oms:snapshot> failed");
@@ -1707,10 +1692,6 @@ oms_status_enu_t oms::Values::parseModelDescriptionFmi3(const filesystem::path&
 
   const char* modelDescription = ::miniunz_onefile_to_memory(root.generic_string().c_str(), "modelDescription.xml");
 
-  // TODO validate modeldescription.xml against schema fmi3ModelDescription.xsd
-  // XercesValidator xercesValidator;
-  // xercesValidator.validateFMU(modelDescription, root.generic_string());
-
   Snapshot snapshot;
   oms_status_enu_t status = snapshot.importResourceMemory("modelDescription.xml", modelDescription);
   ::miniunz_free(modelDescription);