add setting project option -descexl (-ndescexl), update help text

cpm/AbsSyn.dcl

@@ -20,7 +20,7 @@ from System.FilePath import :: FilePath
   |  SetRelativeRoot String
   |  SetTarget String
   |  SetExec String
-  |	SetProjectOptions [ProjectOption]
+  |  SetProjectOptions [ProjectOption]
   |  ProjectHelp
 
 :: PathAction
@@ -41,6 +41,8 @@ from System.FilePath import :: FilePath
 	| DynamicsOff
 	| GenericFusionOn
 	| GenericFusionOff
+	| DescExLOn
+	| DescExLOff
 
 :: ModuleAction
   =  CreateModule ModuleType

cpm/CpmLogic.icl

@@ -33,13 +33,13 @@ doCpmAction cleanhome  pwd  (Environment ea)  world = doEnvironmentAction cleanh
 doCpmAction _          _    _                 world =
   help  "cpm <target>"
     [  "Where <target> is one of the following:"
-    ,  "  <projectname> [--force] [--envs=filename]  : build project <projectname>."
-    ,  "                                               Optionally force build (default: 'false')"
-    ,  "                                               Optionally specify the environments file (default: 'IDEEnvs')"
-    ,  "  project <projectname>                      : project actions"
-    ,  "  module <modulename>                        : module actions"
-    //,  "  environment                                : environment actions"
-    ,  "  make                                       : build all projects in the current directory"
+    ,  "  <projectname> [--force] [--envs=filename] : build project <projectname>."
+    ,  "                                              Optionally force build (default: 'false')"
+    ,  "                                              Optionally specify the environments file (default: 'IDEEnvs')"
+    ,  "  project <projectfile>                     : project actions"
+    ,  "  module <modulename>                       : module actions"
+    //,  "  environment                               : environment actions"
+    ,  "  make                                      : build all projects in the current directory"
     ,  ""
     ,  "Execute `cpm <target> help` to get help for specific actions."] world
 
@@ -155,18 +155,29 @@ where
 		= PR_SetApplicationOptions {PR_GetApplicationOptions project & generic_fusion = True} project
 	set_project_option GenericFusionOff project
 		= PR_SetApplicationOptions {PR_GetApplicationOptions project & generic_fusion = False} project
+	set_project_option DescExLOn project
+		= PR_SetApplicationOptions {PR_GetApplicationOptions project & desc_exl = True} project
+	set_project_option DescExLOff project
+		= PR_SetApplicationOptions {PR_GetApplicationOptions project & desc_exl = False} project
 
 doProjectAction _          _  _   _    world             =
-  help "cpm project <projectname> <action>"
+  help "cpm project <projectfile> <action>"
     [  "Where <action> is one of the following"
-    ,  "  create                              : create a new project"
-    ,  "  show                                : show project information"
-    ,  "  build [--force] [--envs=filename]   : build the project. Optionally force build (default: 'false')"
-    ,  "                                        Optionally specify the environments file (default: 'IDEEnvs')"
-    ,  "  path                                : manage project paths"
-    ,  "  target <env>                        : set target environment to <env>"
-    ,  "  exec <execname>                     : set executable name to <execname>"
-    ,  "  set options                         : set options"
+    ,  "  create                            : create a new project"
+    ,  "  show                              : show project information"
+    ,  "  build [--force] [--envs=filename] : build the project. Optionally force build (default: 'false')"
+    ,  "                                      Optionally specify the environments file (default: 'IDEEnvs')"
+    ,  "  path                              : manage project paths"
+    ,  "  target <env>                      : set target environment to <env>"
+    ,  "  exec <execname>                   : set executable name to <execname>"
+    ,  "  set option [option]               : Set one or more of the following options:"
+    ,  "                                    : -generic_fusion,-ngeneric_fusion"
+    ,  "                                    :     Enable or disable generic fusion"
+    ,  "                                    : -dynamics,-ndynamics"
+    ,  "                                    :     Enable or disable dynamics"
+    ,  "                                    : -descexl,-descexl"
+    ,  "                                    :     Enable or disable descriptor generation and label exporting"
+    ,  "                                    :     This translates to passing -desc and -exl to cocl"
     ] world
 
 /**

cpm/Parser.icl

@@ -85,6 +85,12 @@ parse_Project_options ["-generic_fusion":project_option_args]
 parse_Project_options ["-ngeneric_fusion":project_option_args]
 	# (ok,project_options) = parse_Project_options project_option_args;
 	= (ok,[GenericFusionOff:project_options]);
+parse_Project_options ["-descexl":project_option_args]
+	# (ok,project_options) = parse_Project_options project_option_args;
+	= (ok,[DescExLOn:project_options]);
+parse_Project_options ["-ndescexl":project_option_args]
+	# (ok,project_options) = parse_Project_options project_option_args;
+	= (ok,[DescExLOff:project_options]);
 parse_Project_options []
 	= (True,[]);
 parse_Project_options _