Commit 973fce28 authored by Jurrien Stutterheim's avatar Jurrien Stutterheim
Browse files

CPM now behaves more like BatchBuild wrt paths

parent a6dec362
...@@ -132,14 +132,15 @@ doProjectAction world cleanhome pwd pn ShowProject ...@@ -132,14 +132,15 @@ doProjectAction world cleanhome pwd pn ShowProject
] world ] world
doProjectAction world cleanhome pwd pn (BuildProject force ideenvs) doProjectAction world cleanhome pwd pn (BuildProject force ideenvs)
# envsfile = application_path ideenvs # envsfile = cleanhome </> ideenvs
# (envs, world) = openEnvironments cleanhome envsfile world # (envs, world) = openEnvironments cleanhome envsfile world
# ((proj, ok, err), world) = accFiles (ReadProjectFile pn cleanhome) world # proj_path = GetLongPathName pn
# ((proj, ok, err), world) = accFiles (ReadProjectFile proj_path pwd) world
| not ok || err <> "" = error ("CPM failed while opening project: "+++.err+++."\n") world | not ok || err <> "" = error ("CPM failed while opening project: "+++.err+++."\n") world
# (ok, logfile, world) = openLogfile pn world # (ok, logfile, world) = openLogfile proj_path world
| not ok = error ("CPM failed while opening logfile.\n") world | not ok = error ("CPM failed while opening logfile.\n") world
# default_compiler_options = DefaultCompilerOptions # default_compiler_options = DefaultCompilerOptions
# iniGeneral = initGeneral True default_compiler_options cleanhome pn proj envs logfile # iniGeneral = initGeneral True default_compiler_options pwd proj_path proj envs logfile
# ps = {ls=iniGeneral,gst_world=world,gst_continue_or_stop=False} # ps = {ls=iniGeneral,gst_world=world,gst_continue_or_stop=False}
# {ls, gst_world} = pinit force ps # {ls, gst_world} = pinit force ps
= gst_world = gst_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