Merge branch 'closedown-5.0.x'

Conflicts:
	tools/esdlcmd-xml/esdl2xml.cpp

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

docs/ECLLanguageReference/ECLR_mods/BltInFunc-LoadXML.xml

@@ -56,10 +56,7 @@
   Template language statements or symbols to act on. LOADXML must be the first
   line of code to function correctly.</para>
 
-  <para>A valid XML scope is required for most Template Language<indexterm>
-      <primary>Template Language</primary>
-    </indexterm> statements to work. This is also used in "drilldown" MACRO
-  code.</para>
+  <para>LOADXML is also used in "drilldown" MACRO code.</para>
 
   <para>Example:</para>
 
@@ -99,7 +96,7 @@ OUTPUT(FETCH(Files.TaxData,
 ENDMACRO;
 
 //This example uses #EXPORT to generate the XML
-LOADXML('&lt;xml/&gt;'); //"dummy" XML just to open an XML scope
+
 NamesRecord := RECORD
   STRING10 first;
   STRING20 last;

docs/ECLLanguageReference/ECLR_mods/Templ-EXPORT.xml

@@ -59,9 +59,7 @@
 
   <para>Example:</para>
 
-  <programlisting>  LOADXML('&lt;xml/&gt;'); //"dummy" just to open an XML scope
-  
-  NamesRecord := RECORD
+  <programlisting>  NamesRecord := RECORD
     STRING10 first;
     STRING20 last;
   END;

docs/ECLLanguageReference/ECLR_mods/Templ-EXPORTXML.xml

@@ -39,9 +39,7 @@
 
   <para>Example:</para>
 
-  <programlisting>  LOADXML('&lt;xml/&gt;');
-  
-  NamesRecord := RECORD
+  <programlisting>  NamesRecord := RECORD
     STRING10 first;
     STRING20 last;
   END;

docs/ECLWatch/ECLWa_mods/ECLWatchSrc.xml

@@ -1359,7 +1359,7 @@
         <title>Hex Preview</title>
 
         <para>The Hex Preview shows the contents of a file on the landing zone
-        in hexadecimal form. If the file large then only the first 32k
+        in hexadecimal form. If the file is large, then only the first 32k
         display. Hex preview is designed for fixed length files, although it
         can also work for delimited files but may be limited in that
         regards.</para>
@@ -1394,62 +1394,7 @@
         role="bold">EBCDIC:</emphasis> for it to display properly.</para>
       </sect2>
 
-      <sect2 id="LZ_Spray">
-        <title>Spray Files</title>
-
-        <para>You can spray files to your clusters from the Landing Zone page.
-        <orderedlist>
-            <listitem>
-              <para>Select the file from your drop zone by checking the box
-              next to it.</para>
-            </listitem>
-
-            <listitem>
-              <para>Select the appropriate drop menu option for the type of
-              spray you want.</para>
-
-              <para>For example, to spray a delimited file, select the
-              <emphasis role="bold">Delimited</emphasis> drop menu
-              option.</para>
-
-              <para><figure>
-                  <title>Landing Zone Spray</title>
-
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata fileref="../../images/ECLWA441.jpg" />
-                    </imageobject>
-                  </mediaobject>
-                </figure></para>
-            </listitem>
-
-            <listitem>
-              <para>Fill in the values as appropriate for the spray.</para>
-            </listitem>
-
-            <listitem>
-              <para>Press the <emphasis role="bold">Spray</emphasis> button to
-              spray the file.</para>
-            </listitem>
-          </orderedlist></para>
-
-        <sect3 id="multi-fileSpray">
-          <title>Spray multiple files</title>
-
-          <para>You can choose to spray multiple files with the multi-file
-          spray feature. This feature is useful for spraying a number of files
-          of the same type and the same scope using the same spray
-          options.</para>
-
-          <para>Fixed (length) files can have different record lengths and XML
-          files can have different row tags which must be specified
-          individually for each file. To specify these differences select the
-          files you want to spray and the spray type. You will then see the
-          files listed. Enter the record length or row tag information for
-          each file if using the Fixed or XML spray types, then check all
-          other applicable options and Spray.</para>
-        </sect3>
-      </sect2>
+      <!-- ***Moved SPRAY Files Section over to DH-Mod1.xml: to avoid duplicate data*** -->
     </sect1>
 
     <sect1 id="Pub_Query">

docs/ECLWatch/TheECLWatchMan.xml

@@ -294,14 +294,14 @@
     <sect1 id="spray_and_despray">
       <title>Spray/Despray</title>
 
-      <para>This section details how to Spray and Despray a Data file to your
-      Thor cluster using ECL Watch. The spray function is integrated into the
+      <para>This section details how to Spray and Despray a data file to your
+      cluster using ECL Watch. The spray function is integrated into the
       Landing Zone page as detailed in the <link linkend="Upload_Files">Upload
       Files</link> section .</para>
 
-      <para>In order to spray a file to your Thor cluster you must first
-      upload the file to your landing zone. The file upload steps are detailed
-      in the preceding section.</para>
+      <para>In order to spray a file to your cluster you must first upload the
+      file to your landing zone. The file upload steps are detailed in the
+      preceding section.</para>
 
       <para>With the file successfully uploaded to the landing zone you can
       choose the file to spray from the Landing Zone page. Once selected the
@@ -317,30 +317,49 @@
           </mediaobject>
         </figure></para>
 
-      <sect2>
-        <title>Spray Data to Thor</title>
+      <sect2 id="Spray-to-cluster">
+        <title>Spray Data to a Cluster</title>
 
         <para>With the <emphasis role="bold">Spray:</emphasis> Action buttons
         enabled, you press the appropriate button for the Spray you wish to
         perform. Fill in the appropriate values when prompted to complete the
         spray.</para>
+      </sect2>
 
-        <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                    xpointer="Spray_Fixed"
-                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+      <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
+                  xpointer="LZ_Spray"
+                  xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-        <?hard-pagebreak ?>
+      <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
+                  xpointer="Spray_Fixed"
+                  xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-        <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                    xpointer="Spray_Delimited"
-                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+      <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
+                  xpointer="Spray_Delimited"
+                  xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-        <?hard-pagebreak ?>
+      <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
+                  xpointer="Spray_XML"
+                  xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-        <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                    xpointer="Spray_XML"
-                    xmlns:xi="http://www.w3.org/2001/XInclude" />
-      </sect2>
+      <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
+                  xpointer="Spray_Variable"
+                  xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+      <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
+                  xpointer="Spray_Blob"
+                  xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+      <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
+                  xpointer="Desprays"
+                  xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+      <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml" xpointer="Copy"
+                  xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+      <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
+                  xpointer="Remote_Copy"
+                  xmlns:xi="http://www.w3.org/2001/XInclude" />
     </sect1>
 
     <sect1>

docs/HPCCClientTools/CT_Mods/CT_Comm_Line_DFU.xml

@@ -84,7 +84,7 @@
         command line parameters to send to the Distributed File Utility (DFU)
         engine via the ESP server. These <emphasis>options</emphasis> can be
         specified on the command line, in the <emphasis>@filename</emphasis>,
-        in the dfuplus.ini file, or any combination. </para>
+        in the dfuplus.ini file, or any combination.</para>
 
         <para>Evaluation of options follows this order of precedence:</para>
 
@@ -106,7 +106,25 @@
           </listitem>
         </itemizedlist>
 
-        <para></para>
+        <para><informaltable colsep="1" frame="all" rowsep="0">
+            <tgroup cols="2">
+              <colspec colwidth="49.50pt" />
+
+              <colspec />
+
+              <tbody>
+                <row>
+                  <entry><graphic fileref="../../images/caution.png"
+                  scale="noin" /></entry>
+
+                  <entry>The dfuplus utility does not upload files to a
+                  landing zone. You must first upload any file(s) to your
+                  landing zone using either ECL Watch or a tool that supports
+                  a secure copy protocol, such as SCP or SFTP.</entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </informaltable></para>
 
         <sect3>
           <title>General Options:</title>

docs/HPCCDataHandling/DataHandling.xml

@@ -138,6 +138,10 @@
     <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
                 xpointer="Data_Handling_Methods"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+    <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
+                xpointer="Data_Handling_Using_ECL-Watch"
+                xmlns:xi="http://www.w3.org/2001/XInclude" />  
   </chapter>
 
   <chapter>

ecl/hqlcpp/hqlttcpp.cpp

@@ -6615,10 +6615,13 @@ void WorkflowTransformer::analyseExpr(IHqlExpression * expr)
                 translator.WARNINGAT1(CategoryMistake, queryActiveLocation(expr), HQLWRN_WorkflowSeemsToBeDependent, s.str());
             }
 
+            bool wasConditional = isConditional;
+            isConditional = false;
             unsigned prevWfid = activeWfid;
             activeWfid = ++wfidCount;
             analyseExpr(expr->queryChild(0));
             activeWfid = prevWfid;
+            isConditional = wasConditional;
             return;
         }
     }

esp/services/ws_ecl/ws_ecl_service.cpp

@@ -321,7 +321,7 @@ bool CWsEclService::init(const char * name, const char * type, IPropertyTree * c
     ForEach(*cfgTargets)
         targets.append(cfgTargets->query().queryProp(NULL));
 
-    IPropertyTree *vips = serviceTree->queryPropTree(xpath.str());
+    IPropertyTree *vips = serviceTree->queryPropTree("VIPS");
     Owned<IStringIterator> roxieTargets = getTargetClusters("RoxieCluster", NULL);
     ForEach(*roxieTargets)
     {

esp/services/ws_workunits/ws_workunitsQuerySets.cpp

@@ -842,7 +842,8 @@ bool CWsWorkunitsEx::onWUQuerysets(IEspContext &context, IEspWUQuerysetsRequest
 
 void addClusterQueryStates(IPropertyTree* queriesOnCluster, const char *target, const char *id, IArrayOf<IEspClusterQueryState>& clusterStates, double version)
 {
-    queriesOnCluster = queriesOnCluster->queryPropTree("Endpoint[1]/Queries[1]");
+    if (queriesOnCluster)
+        queriesOnCluster = queriesOnCluster->queryPropTree("Endpoint[1]/Queries[1]");
     if (!queriesOnCluster)
         return;
 
@@ -852,21 +853,24 @@ void addClusterQueryStates(IPropertyTree* queriesOnCluster, const char *target,
     clusterState->setCluster(target);
 
     VStringBuffer xpath("Query[@id='%s']", id);
-    IPropertyTree *query = queriesOnCluster->getPropTree(xpath.str());
-    int suspended = query->getPropInt("@suspended");
-    const char* error = query->queryProp("@error");
+    IPropertyTree *query = queriesOnCluster->queryPropTree(xpath.str());
     if (!query)
         clusterState->setState("Not Found");
-    else if (suspended)
+    else
     {
-        clusterState->setState("Suspended");
-        if (suspended<reporting)
-            clusterState->setMixedNodeStates(true);
+        int suspended = query->getPropInt("@suspended");
+        const char* error = query->queryProp("@error");
+        if (0==suspended)
+            clusterState->setState("Available");
+        else
+        {
+            clusterState->setState("Suspended");
+            if (suspended<reporting)
+                clusterState->setMixedNodeStates(true);
+        }
+        if (error && *error)
+            clusterState->setErrors(error);
     }
-    else
-        clusterState->setState("Available");
-    if ((version >=1.46) && error && *error)
-        clusterState->setErrors(error);
 
     clusterStates.append(*clusterState.getClear());
 }

esp/src/eclwatch/HPCCPlatformWidget.js

@@ -239,7 +239,7 @@ define([
         },
 
         getTitle: function () {
-            return "HPCC Platform";
+            return "ECL Watch";
         },
 
         checkIfAdmin: function (user) {

esp/src/eclwatch/nls/bs/hpcc.js

@@ -465,11 +465,11 @@
     title_GraphPage: "naslov",
     title_Graphs: "Grafikoni",
     title_GridDetails: "Promijeni Me",
-    title_HPCCPlatformECL: "HPCC Platform - Glavna Stranica",
-    title_HPCCPlatformFiles: "HPCC Platform - Datoteke",
-    title_HPCCPlatformMain: "HPCC Platform - Glavna Stranica",
-    title_HPCCPlatformOps: "HPCC Platform - Upravljnje",
-    title_HPCCPlatformRoxie: "HPCC Platform - Roxie",
+    title_HPCCPlatformECL: "ECL Watch Platform - Glavna Stranica",
+    title_HPCCPlatformFiles: "ECL Watch - Datoteke",
+    title_HPCCPlatformMain: "ECL Watch - Glavna Stranica",
+    title_HPCCPlatformOps: "ECL Watch - Upravljnje",
+    title_HPCCPlatformRoxie: "ECL Watch - Roxie",
     title_Inputs: "Unosi",
     title_LFDetails: "Detalji o Logičkol Datoteci",
     title_LZBrowse: "Zona za Pretovar",

esp/src/eclwatch/nls/es/hpcc.js

@@ -467,11 +467,11 @@ define(
     title_GraphPage: "título",
     title_Graphs: "Gráficos",
     title_GridDetails: "Cámbieme",
-    title_HPCCPlatformECL: "Plataforma HPCC - Hogar",
-    title_HPCCPlatformFiles: "Platforma HPCC - Archivos",
-    title_HPCCPlatformMain: "Plataforma HPCC - Hogar",
-    title_HPCCPlatformOps: "Plataforma HPCC - Operaciones",
-    title_HPCCPlatformRoxie: "Plataforma HPCC - Roxie",
+    title_HPCCPlatformECL: "ECL Watch - Hogar",
+    title_HPCCPlatformFiles: "ECL Watch - Archivos",
+    title_HPCCPlatformMain: "ECL Watch - Hogar",
+    title_HPCCPlatformOps: "ECL Watch - Operaciones",
+    title_HPCCPlatformRoxie: "ECL Watch - Roxie",
     title_Inputs: "Entradas",
     title_LFDetails: "Detalles de archivos lógicos",
     title_LZBrowse: "Zonas de descarga",

esp/src/eclwatch/nls/hpcc.js

@@ -476,11 +476,11 @@ define({root:
     title_GraphPage: "title",
     title_Graphs: "Graphs",
     title_GridDetails: "Change Me",
-    title_HPCCPlatformECL: "HPCC Platform - Home",
-    title_HPCCPlatformFiles: "HPCC Platform - Files",
-    title_HPCCPlatformMain: "HPCC Platform - Home",
-    title_HPCCPlatformOps: "HPCC Platform - Operations",
-    title_HPCCPlatformRoxie: "HPCC Platform - Roxie",
+    title_HPCCPlatformECL: "ECL Watch - Home",
+    title_HPCCPlatformFiles: "ECL Watch - Files",
+    title_HPCCPlatformMain: "ECL Watch - Home",
+    title_HPCCPlatformOps: "ECL Watch - Operations",
+    title_HPCCPlatformRoxie: "ECL Watch - Roxie",
     title_Inputs: "Inputs",
     title_LFDetails: "Logical File Details",
     title_LZBrowse: "Landing Zones",

esp/src/eclwatch/nls/hr/hpcc.js

@@ -465,11 +465,11 @@
     title_GraphPage: "naslov",
     title_Graphs: "Grafikoni",
     title_GridDetails: "Promijeni Me",
-    title_HPCCPlatformECL: "HPCC Platform - Glavna Stranica",
-    title_HPCCPlatformFiles: "HPCC Platform - Datoteke",
-    title_HPCCPlatformMain: "HPCC Platform - Glavna Stranica",
-    title_HPCCPlatformOps: "HPCC Platform - Upravljnje",
-    title_HPCCPlatformRoxie: "HPCC Platform - Roxie",
+    title_HPCCPlatformECL: "ECL Watch - Glavna Stranica",
+    title_HPCCPlatformFiles: "ECL Watch - Datoteke",
+    title_HPCCPlatformMain: "ECL Watch - Glavna Stranica",
+    title_HPCCPlatformOps: "ECL Watch - Upravljnje",
+    title_HPCCPlatformRoxie: "ECL Watch - Roxie",
     title_Inputs: "Unosi",
     title_LFDetails: "Detalji o Logičkol Datoteci",
     title_LZBrowse: "Zona za Pretovar",

esp/src/eclwatch/nls/hu/hpcc.js

@@ -469,11 +469,11 @@ define(
     title_GraphPage: "Cím",
     title_Graphs: "Gráfok",
     title_GridDetails: "Változtass meg!",
-    title_HPCCPlatformECL: "HPCC Platform - Kezdőlap",
-    title_HPCCPlatformFiles: "HPCC Platform - Fájlok",
-    title_HPCCPlatformMain: "HPCC Platform - Kezdőlap",
-    title_HPCCPlatformOps: "HPCC Platform - Műveletek",
-    title_HPCCPlatformRoxie: "HPC Platform - Roxie",
+    title_HPCCPlatformECL: "ECL Watch - Kezdőlap",
+    title_HPCCPlatformFiles: "ECL Watch - Fájlok",
+    title_HPCCPlatformMain: "ECL Watch - Kezdőlap",
+    title_HPCCPlatformOps: "ECL Watch - Műveletek",
+    title_HPCCPlatformRoxie: "ECL Watch - Roxie",
     title_Inputs: "Bementek",
     title_LFDetails: "Logikai fájl információk",
     title_LZBrowse: "Lerakatok",

esp/src/eclwatch/nls/pt-br/hpcc.js

@@ -264,11 +264,11 @@
     title_GraphPage: "Título",
     title_Graphs: "Gráficos",
     title_GridDetails: "Change Me",
-    title_HPCCPlatformECL: "Platforma HPCC - Página Inicial",
-    title_HPCCPlatformFiles: "Platforma HPCC - Arquivos",
-    title_HPCCPlatformMain: "Platforma HPCC - Página Inicial",
-    title_HPCCPlatformOpsWidget: "Platforma HPCC - Operações",
-    title_HPCCPlatformRoxie: "Platforma HPCC - Roxie",
+    title_HPCCPlatformECL: "ECL Watch - Página Inicial",
+    title_HPCCPlatformFiles: "ECL Watch - Arquivos",
+    title_HPCCPlatformMain: "ECL Watch - Página Inicial",
+    title_HPCCPlatformOpsWidget: "ECL Watch - Operações",
+    title_HPCCPlatformRoxie: "ECL Watch - Roxie",
     title_LFDetails: "Detalhes dos Arquivos Lógicos",
     title_LZBrowse: "Zona de Entrada de Arquivos",
     title_QuerySetDetails: "Detalhes da Consulta ECL",

esp/src/eclwatch/nls/sr/hpcc.js

@@ -465,11 +465,11 @@
     title_GraphPage: "наслов",
     title_Graphs: "Графикони",
     title_GridDetails: "Промени Ме",
-    title_HPCCPlatformECL: "ХПЦЦ Платформ - Главна Страница",
-    title_HPCCPlatformFiles: "ХПЦЦ Платформ - Датотеке",
-    title_HPCCPlatformMain: "ХПЦЦ Платформ - Главна Страница",
-    title_HPCCPlatformOps: "ХПЦЦ Платформ - Управљње",
-    title_HPCCPlatformRoxie: "ХПЦЦ Платформ - Роkcи",
+    title_HPCCPlatformECL: "ECL Watch - Главна Страница",
+    title_HPCCPlatformFiles: "ECL Watch - Датотеке",
+    title_HPCCPlatformMain: "ECL Watch - Главна Страница",
+    title_HPCCPlatformOps: "ECL Watch - Управљње",
+    title_HPCCPlatformRoxie: "ECL Watch - Роkcи",
     title_Inputs: "Уноси",
     title_LFDetails: "Детаљи о Логичкоj Датотеци",
     title_LZBrowse: "Зона за Претовар",

esp/src/eclwatch/nls/zh/hpcc.js

@@ -464,11 +464,11 @@
     title_GraphPage: "标题",
     title_Graphs: "图形",
     title_GridDetails: "修改",
-    title_HPCCPlatformECL: "HPCC平台 - 首页",
-    title_HPCCPlatformFiles: "HPCC平台 - 文件",
-    title_HPCCPlatformMain: "HPCC平台 - 首页",
-    title_HPCCPlatformOps: "HPCC平台 - 运行",
-    title_HPCCPlatformRoxie: "HPCC平台 - Roxie",
+    title_HPCCPlatformECL: "ECL Watch - 首页",
+    title_HPCCPlatformFiles: "ECL Watch - 文件",
+    title_HPCCPlatformMain: "ECL Watch - 首页",
+    title_HPCCPlatformOps: "ECL Watch - 运行",
+    title_HPCCPlatformRoxie: "ECL Watch - Roxie",
     title_Inputs: "输入",
     title_LFDetails: "逻辑文件的详细说明",
     title_LZBrowse: "文件停放区",

esp/src/stub.htm

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!--
 ##############################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems.
@@ -19,7 +19,8 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>HPCC: Stub</title>
+    <title>ECL Watch</title>
+    <link rel="icon" type="image/png" href="/esp/files/img/favlogo.png">
     <link href="/esp/files/CodeMirror2/lib/codemirror.css" rel="stylesheet">
     <script src="/esp/files/CodeMirror2/lib/codemirror.js"></script>
     <script src="/esp/files/CodeMirror2/lib/util/foldcode.js"></script>

system/jlib/jsuperhash.cpp

@@ -457,6 +457,7 @@ void SuperHashTable::releaseAll(void)
         if (et)
             onRemove(et);
     }
+    tablecount = 0;
 }
 
 void SuperHashTable::kill(void)

testing/regress/hpcc/common/report.py

@@ -60,7 +60,7 @@ class Report:
             for result in self.report._pass:
                 try:
                     if result.Diff !=  '':
-                        passStr += repr(result.Diff)
+                        passStr += str(result.Diff)
                         passStr += "\n"
                 except AttributeError as ae:
                     logging.debug("AttributeError Exception:'%s'",  repr(ae))

testing/regress/hpcc/util/ecl/command.py

@@ -138,7 +138,7 @@ class ECLcmd(Shell):
                         #output generation disabled with //nooutput tag
                         eclfile.diff = '-'
                     else:
-                        eclfile.diff = 'Output of '+eclfile.ecl +' test is:\n\t'+ data
+                        eclfile.diff = 'Output of '+eclfile.ecl +' test is:\n'+ data
                     test = True
                 else:
                     test = eclfile.testResults()

tools/esdlcmd-xml/esdl2xml.cpp

@@ -34,7 +34,7 @@ void static usage(const char* programName)
     puts("Available options:");
     puts(" -r|--recursive: process all includes");
     puts(" -v|--verbose:   display information");
-    puts(" -?/-h:          show this usage page");
+    puts(" -?/-h/--help:   show this usage page");
     exit(1);
 }
 
@@ -48,7 +48,7 @@ void parseCommandLine(int argc, char* argv[], Esdl2Esxdl * cmd)
     {
         if (*argv[i]=='-')
         {
-            if (stricmp(argv[i], "-?")==0 || stricmp(argv[i], "-h")==0)
+            if (stricmp(argv[i], "-?")==0 || stricmp(argv[i], "-h")==0 || stricmp(argv[i], "--help")==0)
             {
                 usage(argv[0]);
             }