diff options
Diffstat (limited to 'stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux')
| -rw-r--r-- | stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux index 34e0cfd46..d056970b8 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux @@ -32,6 +32,7 @@ ["[0]" // {"+" Packager} [// ["[0]" archive {"+" Output} + ["[0]" module] ["[0]" descriptor {"+" Module}] ["[0]" artifact]] ["[0]" cache "_" @@ -139,7 +140,7 @@ manifest))) (def: (write_class static module artifact custom content sink) - (-> Static archive.ID artifact.ID (Maybe Text) Binary java/util/jar/JarOutputStream + (-> Static module.ID artifact.ID (Maybe Text) Binary java/util/jar/JarOutputStream (Try java/util/jar/JarOutputStream)) (let [class_path (|> custom (maybe#each (|>> name.internal name.read)) @@ -154,7 +155,7 @@ (java/util/zip/ZipOutputStream::closeEntry)))))) (def: (write_module static necessary_dependencies [module output] sink) - (-> Static (Set Context) [archive.ID Output] java/util/jar/JarOutputStream + (-> Static (Set Context) [module.ID Output] java/util/jar/JarOutputStream (Try java/util/jar/JarOutputStream)) (let [! try.monad] (monad.mix try.monad @@ -257,8 +258,8 @@ order (cache/module.load_order $.key archive) .let [buffer (java/io/ByteArrayOutputStream::new (.int ..mebi_byte))] sink (|> order - (list#each (function (_ [module [module_id [descriptor document output registry]]]) - [module_id output])) + (list#each (function (_ [module [module_id entry]]) + [module_id (value@ archive.#output entry)])) (monad.mix ! (..write_module static necessary_dependencies) (java/util/jar/JarOutputStream::new buffer (..manifest program)))) [entries duplicates sink] (|> host_dependencies |