From c309fd15a1271c5886b220af6c66d0885cc9092e Mon Sep 17 00:00:00 2001
From: "Dan S. Camper" <dan.camper@lexisnexisrisk.com>
Date: Tue, 25 Jun 2024 12:33:37 -0500
Subject: [PATCH] HPCC-32140 eclcc should expand embedded archives within an
 ECL archive file

Embedded archives will be unpacked into subdirectories based upon their original package values (typically git branch names) or, if package values are not found, an ascending numeric archive_NNNNNN name.
---
 ecl/hql/hqlcache.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ecl/hql/hqlcache.cpp b/ecl/hql/hqlcache.cpp
index 1e9cd46ebd0..1389f456b8c 100644
--- a/ecl/hql/hqlcache.cpp
+++ b/ecl/hql/hqlcache.cpp
@@ -507,6 +507,24 @@ extern HQL_API void expandArchive(const char * path, IPropertyTree * archive, bo
     StringBuffer baseFilename;
     makeAbsolutePath(path, baseFilename, false);
     addPathSepChar(baseFilename);
+    unsigned int embeddedArchiveNum = 0;
+
+    // Look for embedded archives and recursively expand them
+    Owned<IPropertyTreeIterator> embeddedArchives = archive->getElements("Archive");
+    ForEach(*embeddedArchives)
+    {
+        // Append the package value to the path, if it exists
+        StringBuffer embeddedFilename(baseFilename);
+        if (embeddedArchives->query().hasProp("@package"))
+        {
+            embeddedFilename.append(embeddedArchives->query().queryProp("@package"));
+        }
+        else
+        {
+            embeddedFilename.appendf("archive_%0*d", 6, ++embeddedArchiveNum);
+        }
+        expandArchive(embeddedFilename, &embeddedArchives->query(), includePlugins);
+    }
 
     Owned<IPropertyTreeIterator> modules = archive->getElements("Module");
     ForEach(*modules)