Improved migration tool

* fixed tool to keep custom content of main CMakeLists.txt

Author: Arthoni

CMake.in.cmake

@@ -23,7 +23,7 @@ SET(OFBUILD_CUSTOM_CMAKE_VERSION "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.
 SET(OPENFLUID_VERSION_MAJOR 2)
 SET(OPENFLUID_VERSION_MINOR 2)
 SET(OPENFLUID_VERSION_PATCH 1)
-SET(OPENFLUID_VERSION_STATUS "alpha4") # example: SET(OPENFLUID_VERSION_STATUS "rc1")
+SET(OPENFLUID_VERSION_STATUS "alpha5") # example: SET(OPENFLUID_VERSION_STATUS "rc1")
 
 SET(OPENFLUID_VERSION_FULL "${OPENFLUID_VERSION_MAJOR}.${OPENFLUID_VERSION_MINOR}.${OPENFLUID_VERSION_PATCH}")
 

resources/tests/miscsrc/wares-dev-201xx/sim/tests.cmdline.sim-migration/CMakeLists.txt

@@ -5,4 +5,8 @@ INCLUDE(CMake.in.config)
 
 FIND_PACKAGE(OpenFLUIDHelpers REQUIRED)
 
+SET(CUSTOM_VAR foo)
+
 OPENFLUID_ADD_SIMULATOR(SIM)
+
+MESSAGE(STATUS "custom message")

src/apps/openfluid/tests/CMakeLists.txt

@@ -587,7 +587,11 @@ OPENFLUID_ADD_TEST(NAME cmdline-openfluid-MigrateSimulator
                    POST_TEST CHECK_FILE_EXIST "${OFBUILD_TMP_DIR}/cmdline/migrate-ware/sim/tests.cmdline.sim-migration/src/CMakeLists.txt"
                    POST_TEST CHECK_FILE_IDENTICAL "${OFBUILD_TMP_DIR}/cmdline/migrate-ware/sim/tests.cmdline.sim-migration/"
                                                   "${OFBUILD_TMP_DIR}/cmdline/migrate-ware/sim/tests.cmdline.sim-migration/src/REF/"
-                                                  "openfluid-ware.json")
+                                                  "openfluid-ware.json"
+                   POST_TEST CHECK_FILE_CONTAINS "${OFBUILD_TMP_DIR}/cmdline/migrate-ware/sim/tests.cmdline.sim-migration/src/CMakeLists.txt" 
+                                                 "SET(CUSTOM_VAR foo)"
+                   POST_TEST CHECK_FILE_CONTAINS "${OFBUILD_TMP_DIR}/cmdline/migrate-ware/sim/tests.cmdline.sim-migration/src/CMakeLists.txt" 
+                                                 "MESSAGE(STATUS \"custom message\")")
 SET_PROPERTY(TEST cmdline-openfluid-MigrateSimulator
              APPEND PROPERTY ENVIRONMENT "OpenFLUID_DIR=${OFBUILD_DIST_CMAKE_MODULES_DIR};OpenFLUID_EXTRA_SEARCH_PATHS=${CMAKE_BINARY_DIR}/src\;${OFBUILD_DIST_DIR};OpenFLUID_MIGRATION_INCLUDE_PATHS=${CMAKE_SOURCE_DIR}/src")
 set_tests_properties(cmdline-openfluid-MigrateSimulator PROPERTIES FIXTURES_SETUP SimulatorMigrated)

src/openfluid/waresdev/WareSrcMigrator.cpp

@@ -963,12 +963,14 @@ WareSrcMigrator::processCMakeFiles(const WareSrcMigrator::WareMigrationInfo& Inf
   mp_Listener->stageMessage("processing " + openfluid::config::WARESDEV_SRC_CMAKESTDFILE);
 
   auto CMakeWareVar = Info.CMakeDefaultWareVar;
+  std::vector<std::string> CMakeContentLines;
 
   auto CMakeFileObj = m_SrcPathObj.fromThis(openfluid::config::WARESDEV_SRC_CMAKESTDFILE);
   if (CMakeFileObj.isFile())
   {
     // search for correct variable name
     auto CMakeContent = openfluid::tools::Filesystem::readFile(CMakeFileObj);
+    CMakeContentLines = getFileLines(CMakeFileObj);
     if (!CMakeContent.empty())
     {
       // search for default
@@ -1020,6 +1022,36 @@ WareSrcMigrator::processCMakeFiles(const WareSrcMigrator::WareMigrationInfo& Inf
                                          return (L.empty() || L[0] == '#');
                                        }), 
                         ConfigLines.end());
+      
+      std::vector<std::string> CustomContentLines;
+      bool IsCustomCMakeContent = false;
+      for (std::vector<std::string>::size_type i=0; i<CMakeContentLines.size();i++)
+      {
+        std::list<std::string> DefaultLineBegins = {"PROJECT(", "CMAKE_MINIMUM_REQUIRED(", "INCLUDE(CMake.in.config)", 
+                                                    "FIND_PACKAGE(OpenFLUIDHelpers REQUIRED)", "OPENFLUID_ADD_"};
+        bool IsDefault = false;
+        for (const auto& Begin : DefaultLineBegins)
+        {
+          if (CMakeContentLines[i].substr(0,Begin.length()) == Begin)
+          {
+            IsDefault = true;
+          }
+        }
+        if (!IsDefault)
+        {
+          CustomContentLines.push_back(CMakeContentLines[i]);
+          if (CMakeContentLines[i].size() > 0)
+          {
+            IsCustomCMakeContent = true;
+          }
+        }
+      }
+      if (IsCustomCMakeContent)
+      {
+        ConfigLines.push_back("");
+        ConfigLines.push_back("# Custom content from main CMakeLists.txt");
+        ConfigLines.insert(ConfigLines.end(), CustomContentLines.begin(), CustomContentLines.end() );
+      }
 
       const auto ConfigContent = openfluid::tools::join(ConfigLines," ");
       std::map<std::string,std::string> ConfigVariables;