Commit b4d7c2f2 authored by Jurrien Stutterheim's avatar Jurrien Stutterheim

s/err/prjok in doProjectAction

parent ebb0e9c8
......@@ -88,11 +88,12 @@ doCpmAction :: *World String String .CpmAction -> .World
doCpmAction world cleanhome pwd (Project pn pa) = doProjectAction world cleanhome pwd pn pa
doCpmAction world cleanhome pwd (Module mn ma) = doModuleAction world cleanhome mn ma
doCpmAction world _ _ _ =
help "cpm <target>" [ "Where <target> is one of the following:"
, " project <filename.prj> : project actions"
, " module : module actions"
, ""
, "Execute `cpm <target> help` to get help for specific actions."] world
help "cpm <target>"
[ "Where <target> is one of the following:"
, " project <filename.prj> : project actions"
, " module : module actions"
, ""
, "Execute `cpm <target> help` to get help for specific actions."] world
doProjectAction :: *World .String .String .String .ProjectAction -> .World
doProjectAction world cleanhome pwd pn CreateProject
......@@ -108,8 +109,8 @@ doProjectAction world cleanhome pwd pn CreateProject
# project = PR_NewProject mainmodule edit_options compiler_options DefCodeGenOptions
DefApplicationOptions [!!] DefaultLinkOptions
# project = PR_SetRoot mainmodule edit_options compiler_options project
# (err,world) = accFiles (SaveProjectFile projectfile project cleanhome) world
| err = error ("Could not create project file " +++ projectfile) world
# (prjok, world) = accFiles (SaveProjectFile projectfile project cleanhome) world
| not prjok = error ("Could not create project file " +++ projectfile) world
= world
doProjectAction world cleanhome pwd pn ShowProject
......@@ -140,11 +141,12 @@ doProjectAction world cleanhome pwd pn (BuildProject force ideenvs)
doProjectAction world cleanhome _ pn (ProjectPath pa) = doProjectPathAction world cleanhome pn pa
doProjectAction world _ _ _ _ =
help "cpm project <projectname.prj> <action>" [ "Where <action> is one of the following"
, " create : create a new project"
, " show : show project information"
, " build [--force] : build the project. Optionally force build (default: 'false')"
, " path <add|remove> : add or remove a path from the project"] world
help "cpm project <projectname.prj> <action>"
[ "Where <action> is one of the following"
, " create : create a new project"
, " show : show project information"
, " build [--force] : build the project. Optionally force build (default: 'false')"
, " path <add|remove> : add or remove a path from the project"] world
doProjectPathAction :: *World .String .String .PathAction -> .World
doProjectPathAction world cleanhome pn (AddPathAction path)
......@@ -177,8 +179,9 @@ doModuleAction world cleanhome mn CreateModule
= undef
doModuleAction world _ _ _ =
help "cpm module <action>" [ "Where <action> is one of the following"
, " create [application|library] : create a new module. Optionally specify module type (default: 'library')"] world
help "cpm module <modulename> <action>"
[ "Where <action> is one of the following"
, " create [application|library] : create a new module. Optionally specify module type (default: 'library')"] world
error :: {#.Char} *World -> .World
error message world
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment