Merge pull request #10818 from richardkchapman/hpcc16652

HPCC-16652 Spurious "Roxie requires constant filenames" errors

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

ecl/eclcmd/eclcmd_core.cpp

@@ -893,6 +893,14 @@ public:
         req->setCloneWorkunit(true);
         req->setNoRootTag(optNoRoot);
 
+        // Add a debug value to indicate that Roxie variable filenames are ok
+        // We put it at front of list so that it can be overridden explicitly by user.
+
+        Owned<IEspNamedValue> nv = createNamedValue();
+        nv->setName("allowVariableRoxieFileNames");
+        nv->setValue("1");
+        debugValues.add(*nv.getClear(), 0);
+
         StringBuffer wuid;
         StringBuffer wuCluster;
         StringBuffer query;

ecl/hqlcpp/hqlhtcpp.cpp

@@ -3291,7 +3291,7 @@ void HqlCppTranslator::noteFilename(ActivityInstance & instance, const char * na
         {
             if (!folded->queryValue())
             {
-                if (!isDynamic && !options.allowVariableRoxieFilenames && targetRoxie())
+                if (!isDynamic && !options.allowVariableRoxieFilenames && !options.standAloneExe && targetRoxie())
                 {
                     StringBuffer x;
                     folded->toString(x);