diff options
Diffstat (limited to 'stdlib/source/program')
| -rw-r--r-- | stdlib/source/program/compositor.lux | 20 | ||||
| -rw-r--r-- | stdlib/source/program/compositor/static.lux | 13 |
2 files changed, 9 insertions, 24 deletions
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index b398f85e3..7df24358b 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -42,6 +42,7 @@ [extension {"+" Extender}]]]] [meta [packager {"+" Packager}] + [context {"+" Context}] ["[0]" cli {"+" Service}] ["[0]" import] ["[0]" export] @@ -52,9 +53,7 @@ [io ["ioW" archive]]]] ... ["[0]" interpreter] - ]]] - ["[0]" / "_" - ["[1][0]" static {"+" Static}]]) + ]]]) (def: (or_crash! failure_description action) (All (_ a) @@ -92,8 +91,8 @@ (format "Duration: ")))]] (in output))) -(def: (package! fs host_dependencies [packager package] static archive context) - (-> (file.System Async) (Dictionary file.Path Binary) [Packager file.Path] Static Archive unit.ID (Async (Try Any))) +(def: (package! fs host_dependencies [packager package] archive context) + (-> (file.System Async) (Dictionary file.Path Binary) [Packager file.Path] Archive unit.ID (Async (Try Any))) (case (packager host_dependencies archive context) {try.#Success content} (case content @@ -129,12 +128,12 @@ (dictionary.has head content output))))))) (with_expansions [<parameters> (as_is anchor expression artifact)] - (def: .public (compiler static + (def: .public (compiler file_context expander host_analysis platform generation_bundle host_directive_bundle program anchorT,expressionT,directiveT extender service packager,package) (All (_ <parameters>) - (-> Static + (-> Context Expander analysis.Bundle (IO (Platform <parameters>)) @@ -162,15 +161,15 @@ (Async (Try [(directive.State+ <parameters>) Archive phase.Wrapper])) - (:expected (platform.initialize static compilation_module expander host_analysis platform generation_bundle host_directive_bundle program anchorT,expressionT,directiveT extender + (:expected (platform.initialize file_context compilation_module expander host_analysis platform generation_bundle host_directive_bundle program anchorT,expressionT,directiveT extender import compilation_sources))) [archive state] (:sharing [<parameters>] (Platform <parameters>) platform (Async (Try [Archive (directive.State+ <parameters>)])) - (:expected (platform.compile phase_wrapper import static expander platform compilation [archive state]))) - _ (ioW.freeze (value@ platform.#&file_system platform) static archive) + (:expected (platform.compile phase_wrapper import file_context expander platform compilation [archive state]))) + _ (ioW.freeze (value@ platform.#&file_system platform) file_context archive) program_context (async#in ($/program.context archive)) host_dependencies (..load_host_dependencies (value@ platform.#&file_system platform) compilation_host_dependencies) _ (..package! (for [@.old (file.async file.default) @@ -180,7 +179,6 @@ @.js (maybe.trusted file.default)]) host_dependencies packager,package - static archive program_context)] (in (debug.log! "Compilation complete!")))) diff --git a/stdlib/source/program/compositor/static.lux b/stdlib/source/program/compositor/static.lux deleted file mode 100644 index 840bd3448..000000000 --- a/stdlib/source/program/compositor/static.lux +++ /dev/null @@ -1,13 +0,0 @@ -(.using - [library - [lux "*" - [target {"+" Target}] - [world - [file {"+" Path}]]]]) - -(type: .public Static - (Record - [#host Target - #host_module_extension Text - #target Path - #artifact_extension Text])) |