[projmgr] Check specified linker script existence

Author: grasci-arm

tools/projmgr/include/ProjMgrWorker.h

@@ -833,6 +833,7 @@ class ProjMgrWorker {
 
   bool LoadPacks(ContextItem& context);
   bool CheckMissingPackRequirements(const std::string& contextName);
+  void CheckMissingLinkerScript(ContextItem& context);
   bool CollectRequiredPdscFiles(ContextItem& context, const std::string& packRoot);
   bool CheckBoardDeviceInLayer(const ContextItem& context, const ClayerItem& clayer);
   bool CheckCompiler(const std::vector<std::string>& forCompiler, const std::string& selectedCompiler);

tools/projmgr/src/ProjMgrWorker.cpp

@@ -2093,15 +2093,19 @@ bool ProjMgrWorker::ProcessConfigFiles(ContextItem& context) {
         ProjMgrLogger::Get().Warn("conflict: automatic linker script generation overrules specified script '" + context.linker.script + "'", context.name);
         context.linker.script.clear();
       }
-    }
-    else if (context.linker.script.empty() && context.linker.regions.empty() && context.linker.defines.empty()) {
-      const auto& groups = context.rteActiveTarget->GetProjectGroups();
-      for (auto group : groups) {
-        for (auto file : group.second) {
-          if (file.second.m_cat == RteFile::Category::LINKER_SCRIPT) {
-            error_code ec;
-            context.linker.script = fs::relative(context.cproject->directory + "/" + file.first, context.directories.cprj, ec).generic_string();
-            break;
+    } else {
+      // check user specified linker script
+      CheckMissingLinkerScript(context);      
+      // search for linker script among selected component files
+      if (context.linker.script.empty() && context.linker.regions.empty() && context.linker.defines.empty()) {
+        const auto& groups = context.rteActiveTarget->GetProjectGroups();
+        for (auto group : groups) {
+          for (auto file : group.second) {
+            if (file.second.m_cat == RteFile::Category::LINKER_SCRIPT) {
+              error_code ec;
+              context.linker.script = fs::relative(context.cproject->directory + "/" + file.first, context.directories.cprj, ec).generic_string();
+              break;
+            }
           }
         }
       }
@@ -5243,6 +5247,19 @@ bool ProjMgrWorker::CheckMissingFiles() {
   return !error;
 }
 
+void ProjMgrWorker::CheckMissingLinkerScript(ContextItem& context) {
+  // check linker script existence
+  if (!context.linker.script.empty()) {
+    string script = context.linker.script;
+    if (RteFsUtils::IsRelative(context.linker.script)) {
+      RteFsUtils::NormalizePath(script, context.directories.cprj);
+    }
+    if (!RteFsUtils::Exists(script)) {
+      m_missingFiles.insert({ script, FileNode() });
+    }
+  }
+}
+
 void ProjMgrWorker::CollectUnusedPacks() {
   for (const auto& contextName : m_selectedContexts) {
     auto& context = m_contexts[contextName];

tools/projmgr/test/data/TestSolution/LinkerOptions/layer/linkerScript.ld

@@ -0,0 +1 @@
+/* Dummy */

tools/projmgr/test/data/TestSolution/LinkerOptions/linker.cproject.yml

@@ -12,6 +12,8 @@ project:
        - LD_PP_GCC_CPROJECT_DEF0
        - LD_PP_GCC_CPROJECT_DEF1
       for-compiler: GCC
+    - script: ./unknown.sct
+      for-context: .Missing
 
   setups:
     - linker:

tools/projmgr/test/data/TestSolution/LinkerOptions/linker.csolution.yml

@@ -19,6 +19,8 @@ solution:
       compiler: AC6
     - type: AutoGenWarning
       compiler: AC6
+    - type: Missing
+      compiler: AC6
 
   target-types:
     - type: RteTest_ARMCM3

tools/projmgr/test/data/TestSolution/LinkerOptions/linkerScript.sct

@@ -0,0 +1 @@
+/* Dummy */

tools/projmgr/test/src/ProjMgrUnitTests.cpp

@@ -4483,6 +4483,21 @@ TEST_F(ProjMgrUnitTests, RunProjMgr_LinkerOptions) {
     testinput_folder + "/TestSolution/LinkerOptions/ref/linker.Debug_GCC+RteTest_ARMCM3.cbuild.yml");
 }
 
+TEST_F(ProjMgrUnitTests, RunProjMgr_MissingLinkerScript) {
+  char* argv[7];
+  const string& csolution = testinput_folder + "/TestSolution/LinkerOptions/linker.csolution.yml";
+  argv[1] = (char*)"convert";
+  argv[2] = (char*)csolution.c_str();
+  argv[3] = (char*)"-o";
+  argv[4] = (char*)testoutput_folder.c_str();
+  argv[5] = (char*)"-c";
+  argv[6] = (char*)"linker.Missing+RteTest_ARMCM3";
+  EXPECT_EQ(1, RunProjMgr(7, argv, m_envp));
+  const string& expected = "file '.*/TestSolution/LinkerOptions/unknown.sct' was not found";
+  const YAML::Node& cbuild = YAML::LoadFile(testoutput_folder + "/linker.cbuild-idx.yml");
+  EXPECT_TRUE(regex_search(cbuild["build-idx"]["cbuilds"][0]["messages"]["errors"][0].as<string>(), regex(expected)));
+}
+
 TEST_F(ProjMgrUnitTests, RunProjMgr_LinkerOptions_Auto) {
   char* argv[8];
   const string& csolution = testinput_folder + "/TestSolution/LinkerOptions/linker.csolution.yml";