HPCC-14476 Further enhances simple bug fix

- Removes --compfilesdir and --CDE
- Adds --ecl-imports
- No longer prefixes generated import statements with "$."

Signed-off-by: rpastrana <rodrigo.pastrana@lexisnexis.com>

esp/xslt/esdl2ecl.xslt

@@ -27,7 +27,7 @@
     <xsl:template match="text()" name="outputImports">
     <xsl:param name="import" select="."/>
         <xsl:if test="string-length($import) > 0">
-            <xsl:text>import $.</xsl:text><xsl:value-of select="$import"/><xsl:text>;
+            <xsl:text>import </xsl:text><xsl:value-of select="$import"/><xsl:text>;
 </xsl:text>
         </xsl:if>
     </xsl:template>

tools/esdlcmd/esdl2ecl.cpp

@@ -238,7 +238,7 @@ public:
                 continue;
             if (iter.matchFlag(optOutputExpandedXML, ESDL_CONVERT_EXPANDEDXML) || iter.matchFlag(optOutputExpandedXML, ESDL_CONVERT_EXPANDEDXML_x))
                 continue;
-            if (iter.matchFlag(optHPCCCompFilesDir, HPCC_COMPONENT_FILES_DIR) || iter.matchFlag(optHPCCCompFilesDir, HPCC_COMPONENT_FILES_DIR_CDE))
+            if (iter.matchFlag(optHPCCCompFilesDir, HPCC_COMPONENT_FILES_DIR_CDE))
                 continue;
             if (iter.matchFlag(optRollUpEclToSingleFile, ESDL_OPTION_ROLLUP))
                 continue;
@@ -261,7 +261,7 @@ public:
             return EsdlCmdOptionMatch;
         if (iter.matchFlag(optOutputExpandedXML, ESDL_CONVERT_EXPANDEDXML) || iter.matchFlag(optOutputExpandedXML, ESDL_CONVERT_EXPANDEDXML_x))
             return EsdlCmdOptionMatch;
-        if (iter.matchOption(optHPCCCompFilesDir, HPCC_COMPONENT_FILES_DIR) || iter.matchFlag(optHPCCCompFilesDir, HPCC_COMPONENT_FILES_DIR_CDE))
+        if (iter.matchFlag(optHPCCCompFilesDir, HPCC_COMPONENT_FILES_DIR_CDE))
             return EsdlCmdOptionMatch;
         if (iter.matchOption(optHPCCCompFilesDir, ESDL_OPTION_ECL_INCLUDE_LIST))
             return EsdlCmdOptionMatch;
@@ -379,8 +379,8 @@ public:
                 "      -x, --expandedxml     Output expanded XML files\n"
                 "      --includes            Process all included files\n"
                 "      --rollup              Roll-up all processed includes to single ecl output file\n"
-                "      --CDE, --compfilesdir HPCC Component files directory (xslt files)\n"
-                "      --ecl-includes        Coma-delimited import list to be attached to output ECL\n"
+                "      -cde                  HPCC Component files directory (xslt files)\n"
+                "      --ecl-imports         Coma-delimited import list to be attached to output ECL\n"
                 "                            each entry generates a corresponding import *.<entry>\n"
                 "      --ecl-header          Text included in target header (must be valid ECL) \n"
                 ,stdout);

tools/esdlcmd/esdlcmd_common.hpp

@@ -57,8 +57,7 @@ typedef IEsdlCommand *(*EsdlCommandFactory)(const char *cmdname);
 #define ESDL_CONVERT_EXPANDEDXML        "--expandedxml"
 #define ESDL_CONVERT_EXPANDEDXML_x      "-x"
 
-#define HPCC_COMPONENT_FILES_DIR        "--compfilesdir"
-#define HPCC_COMPONENT_FILES_DIR_CDE    "--CDE"
+#define HPCC_COMPONENT_FILES_DIR_CDE    "-cde"
 
 #define ESDLOPT_XSLT_PATH               "--xslt"
 
@@ -98,7 +97,7 @@ typedef IEsdlCommand *(*EsdlCommandFactory)(const char *cmdname);
 #define ESDL_OPTION_CONFIG              "--config"
 #define ESDL_OPTION_OVERWRITE           "--overwrite"
 #define ESDL_OPTION_ROLLUP              "--rollup"
-#define ESDL_OPTION_ECL_INCLUDE_LIST    "--ecl-includes"
+#define ESDL_OPTION_ECL_INCLUDE_LIST    "--ecl-imports"
 #define ESDL_OPTION_ECL_HEADER_BLOCK    "--ecl-header"