diff options
Diffstat (limited to 'CC/foreign/shell/EXPRESSIONS')
| -rw-r--r-- | CC/foreign/shell/EXPRESSIONS | 58 |
1 files changed, 5 insertions, 53 deletions
diff --git a/CC/foreign/shell/EXPRESSIONS b/CC/foreign/shell/EXPRESSIONS index 3836388..1ed7daa 100644 --- a/CC/foreign/shell/EXPRESSIONS +++ b/CC/foreign/shell/EXPRESSIONS @@ -3,8 +3,8 @@ [ "cmds" , "sources" , "localbase" - , "outs" - , "out_dirs" + , "installed_files" + , "installed_dirs" , "CC" , "CXX" , "CFLAGS" @@ -38,7 +38,6 @@ , "foreign-PATH": ["CC/foreign", "default-PATH"] , "foreign-TOOLCHAIN": ["CC/foreign", "default-TOOLCHAIN"] , "foreign-NON_SYSTEM_TOOLS": ["CC/foreign", "default-NON_SYSTEM_TOOLS"] - , "strip-prefix": ["CC/foreign", "strip-prefix"] } , "expression": { "type": "let*" @@ -210,7 +209,6 @@ ] } ] - , ["install_prefix", "install"] , [ "localbase" , { "type": "to_subdir" , "subdir": "localbase" @@ -223,34 +221,6 @@ , "$1": {"type": "var", "name": "sources"} } ] - , [ "installed_out_files" - , { "type": "foreach" - , "var": "file_path" - , "range": {"type": "var", "name": "outs"} - , "body": - { "type": "join" - , "separator": "/" - , "$1": - [ {"type": "var", "name": "install_prefix"} - , {"type": "var", "name": "file_path"} - ] - } - } - ] - , [ "installed_out_dirs" - , { "type": "foreach" - , "var": "dir_path" - , "range": {"type": "var", "name": "out_dirs"} - , "body": - { "type": "join" - , "separator": "/" - , "$1": - [ {"type": "var", "name": "install_prefix"} - , {"type": "var", "name": "dir_path"} - ] - } - } - ] , [ "script" , { "type": "singleton_map" , "key": "run_cmds.sh" @@ -314,33 +284,15 @@ ] } , "cmd": ["sh", "run_cmds.sh"] - , "outs": {"type": "var", "name": "installed_out_files"} - , "out_dirs": {"type": "var", "name": "installed_out_dirs"} + , "outs": {"type": "var", "name": "installed_files"} + , "out_dirs": {"type": "var", "name": "installed_dirs"} , "env": {"type": "var", "name": "ENV"} , "timeout scaling": {"type": "var", "name": "TIMEOUT_SCALE", "default": 10.0} } ] ] - , "body": - { "type": "map_union" - , "$1": - { "type": "let*" - , "bindings": - [ ["artifacts", {"type": "var", "name": "artifacts"}] - , [ "paths" - , { "type": "++" - , "$1": - [ {"type": "var", "name": "outs"} - , {"type": "var", "name": "out_dirs"} - ] - } - ] - , ["prefix", {"type": "var", "name": "install_prefix"}] - ] - , "body": {"type": "CALL_EXPRESSION", "name": "strip-prefix"} - } - } + , "body": {"type": "var", "name": "artifacts"} } } } |