diff options
| author | Eduardo Julian | 2020-10-25 23:16:14 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2020-10-25 23:16:14 -0400 |
| commit | cb8f2b36352948108446c7e3b270faa97589bf7a (patch) | |
| tree | 25ebf796bbbd3ad31519745b7276d38f6c19726c /stdlib/source/program/aedifex/command | |
| parent | 72b4eecdc514387ab3b1c105cfd49436c9eb1e8d (diff) | |
Some small refactoring.
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/program/aedifex/command/build.lux | 14 | ||||
| -rw-r--r-- | stdlib/source/program/aedifex/command/deploy.lux | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index 6a1ab93d4..2d8ffb763 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -89,7 +89,7 @@ (-> Resolution (List Path)) (|>> dictionary.keys (list.filter (|>> (get@ #///dependency.type) (text@= ///artifact/type.lux-library))) - (list@map (|>> (get@ #///dependency.artifact) (///local.path file.system))))) + (list@map (|>> (get@ #///dependency.artifact) (///local.path file.default))))) (import: java/lang/String) @@ -124,24 +124,24 @@ [(#.Some program) (#.Some target)] (do ///action.monad - [cache (///local.all-cached (file.async file.system) + [cache (///local.all-cached (file.async file.default) (set.to-list (get@ #///.dependencies profile)) ///dependency/resolution.empty) resolution (promise.future (///dependency/resolution.resolve-all (set.to-list (get@ #///.repositories profile)) (set.to-list (get@ #///.dependencies profile)) cache)) - _ (///local.cache-all (file.async file.system) + _ (///local.cache-all (file.async file.default) resolution) [resolution compiler] (promise@wrap (..compiler resolution)) working-directory (promise.future ..working-directory) #let [libraries (..libraries resolution) [prefix output] (case compiler - (#JVM artifact) [(format "java -jar " (///local.path file.system artifact)) + (#JVM artifact) [(format "java -jar " (///local.path file.default artifact)) "program.jar"] - (#JS artifact) [(format "node --stack_size=8192 " (///local.path file.system artifact)) + (#JS artifact) [(format "node --stack_size=8192 " (///local.path file.default artifact)) "program.js"]) - cache-directory (format working-directory (:: file.system separator) target) + cache-directory (format working-directory (:: file.default separator) target) command (format prefix " build" " " (..plural-parameter "--library" libraries) " " (..plural-parameter "--source" (set.to-list (get@ #///.sources profile))) @@ -151,5 +151,5 @@ outcome (///shell.execute command working-directory) #let [_ (log! "[BUILD ENDED]")]] (wrap [compiler - (format cache-directory (:: file.system separator) output)])) + (format cache-directory (:: file.default separator) output)])) )) diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux index d7c7802b7..b8ac5c97c 100644 --- a/stdlib/source/program/aedifex/command/deploy.lux +++ b/stdlib/source/program/aedifex/command/deploy.lux @@ -65,7 +65,7 @@ content))))] (do {@ ///action.monad} [library (:: @ map (binary.run tar.writer) - (export.library (file.async file.system) + (export.library (file.async file.default) (set.to-list (get@ #/.sources profile)))) pom (promise@wrap (///pom.write profile)) _ (deploy! ///artifact/type.pom (|> pom (:: xml.codec encode) encoding.to-utf8)) |