Merge remote-tracking branch 'origin/candidate-9.2.x'

Signed-off-by: Gavin Halliday <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # helm/hpcc/templates/dafilesrv.yaml # helm/hpcc/templates/dali.yaml # helm/hpcc/templates/dfuserver.yaml # helm/hpcc/templates/eclagent.yaml # helm/hpcc/templates/eclccserver.yaml # helm/hpcc/templates/eclscheduler.yaml # helm/hpcc/templates/esp.yaml # helm/hpcc/templates/localroxie.yaml # helm/hpcc/templates/roxie.yaml # helm/hpcc/templates/sasha.yaml # helm/hpcc/templates/thor.yaml # version.cmake
ghalliday · Jun 16, 2023 · c71f587 · c71f587
2 parents fa75b12 + c07e543
commit c71f587
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/ecl/eclcc/eclcc.cpp b/ecl/eclcc/eclcc.cpp
@@ -852,12 +852,9 @@ void EclCC::reportCompileErrors(IErrorReceiver & errorProcessor, const char * pr
 
 //=========================================================================================
 
-void gatherResourceManifestFilenames(EclCompileInstance & instance, StringArray &filenames)
+static void gatherResourceManifestFilenames(IPropertyTree * tree, const char * tag, StringArray &filenames)
 {
-    IPropertyTree *tree = (instance.archive) ? instance.archive.get() : instance.globalDependTree.get();
-    if (!tree)
-        return;
-    Owned<IPropertyTreeIterator> iter = tree->getElements((instance.archive) ? "Module/Attribute" : "Attribute");
+    Owned<IPropertyTreeIterator> iter = tree->getElements(tag);
     ForEach(*iter)
     {
         StringBuffer filename(iter->query().queryProp("@sourcePath"));
@@ -871,6 +868,24 @@ void gatherResourceManifestFilenames(EclCompileInstance & instance, StringArray
                 filenames.append(filename);
         }
     }
+
+}
+
+void gatherResourceManifestFilenames(EclCompileInstance & instance, StringArray &filenames)
+{
+    if (instance.archive)
+    {
+        gatherResourceManifestFilenames(instance.archive, "Module/Attribute", filenames);
+
+        //Gather resources from dependent packages
+        Owned<IPropertyTreeIterator> packageIter = instance.archive->getElements("Archive");
+        ForEach(*packageIter)
+            gatherResourceManifestFilenames(&packageIter->query(), "Module/Attribute", filenames);
+    }
+    else if (instance.globalDependTree)
+    {
+        gatherResourceManifestFilenames(instance.globalDependTree, "Attribute", filenames);
+    }
 }
 
 void EclCC::instantECL(EclCompileInstance & instance, IWorkUnit *wu, const char * queryFullName, IErrorReceiver & errorProcessor, const char * outputFile)
@@ -2961,8 +2976,9 @@ int EclCC::parseCommandLineOptions(int argc, const char* argv[])
         else if (iter.matchFlag(optSaveQueryArchive, "-qa"))
         {
         }
-        else if (iter.matchOptionText(eclRepoPath, "--repocachepath", false, false))
+        else if (iter.matchOption(tempArg, "--repocachepath"))
         {
+            eclRepoPath.set(tempArg);
         }
         else if (iter.matchFlag(optNoCompile, "-S"))
         {

diff --git a/ecl/eclccserver/eclccserver.cpp b/ecl/eclccserver/eclccserver.cpp
@@ -641,7 +641,7 @@ class EclccCompileThread : implements IPooledThread, implements IErrorReporter,
         //Ensure that each child compile has a separate directory for the cloned git repositories.
         //It means the caches are not shared, but avoids the clones/fetches from affecting each other
         if (!repoRootPath.isEmpty())
-            eclccCmd.appendf(" --repocachepath=\"%s\"", repoRootPath.str());
+            eclccCmd.appendf(" \"--repocachepath=%s\"", repoRootPath.str());
 
         if (config->queryProp("@defaultRepo"))
             eclccCmd.appendf(" --defaultrepo=%s", config->queryProp("@defaultRepo"));

diff --git a/ecl/hql/hqlexpr.cpp b/ecl/hql/hqlexpr.cpp
@@ -1323,7 +1323,7 @@ static IPropertyTree * querySelectPackage(IPropertyTree * archive, const char *
     return archive;
 }
 
-//This function ensures that there is an iniitailised <Module> tag within the appropriate <Archive>
+//This function ensures that there is an initialised <Module> tag within the appropriate <Archive>
 IPropertyTree * queryEnsureArchiveModule(IPropertyTree * archive, const char * package, const char * name, IHqlScope * scope)
 {
     archive = querySelectPackage(archive, package);

diff --git a/vcpkg b/vcpkg