From 0f545b7e57d2564e351d907befd2ce26900c5521 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 24 Jul 2021 02:14:12 -0400
Subject: Now packaging JVM programs as "fat" jars in new JVM compiler.

---
 stdlib/source/program/compositor/cli.lux | 40 ++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 17 deletions(-)

(limited to 'stdlib/source/program/compositor/cli.lux')

diff --git a/stdlib/source/program/compositor/cli.lux b/stdlib/source/program/compositor/cli.lux
index d3b61640b..f0fdb80be 100644
--- a/stdlib/source/program/compositor/cli.lux
+++ b/stdlib/source/program/compositor/cli.lux
@@ -16,6 +16,9 @@
 (type: #export Source
   Path)
 
+(type: #export Host_Dependency
+  Path)
+
 (type: #export Library
   Path)
 
@@ -23,7 +26,7 @@
   Path)
 
 (type: #export Compilation
-  [(List Source) (List Library) Target Module])
+  [(List Source) (List Host_Dependency) (List Library) Target Module])
 
 (type: #export Export
   [(List Source) Target])
@@ -38,10 +41,11 @@
      (Parser <type>)
      (cli.named <long> cli.any))]
 
-  [^source "--source" Source]
-  [^library "--library" Library]
-  [^target "--target" Target]
-  [^module "--module" Module]
+  [source_parser "--source" Source]
+  [host_dependency_parser "--host_dependency" Host_Dependency]
+  [library_parser "--library" Library]
+  [target_parser "--target" Target]
+  [module_parser "--module" Module]
   )
 
 (def: #export service
@@ -49,25 +53,27 @@
   ($_ <>.or
       (<>.after (cli.this "build")
                 ($_ <>.and
-                    (<>.some ..^source)
-                    (<>.some ..^library)
-                    ..^target
-                    ..^module))
+                    (<>.some ..source_parser)
+                    (<>.some ..host_dependency_parser)
+                    (<>.some ..library_parser)
+                    ..target_parser
+                    ..module_parser))
       (<>.after (cli.this "repl")
                 ($_ <>.and
-                    (<>.some ..^source)
-                    (<>.some ..^library)
-                    ..^target
-                    ..^module))
+                    (<>.some ..source_parser)
+                    (<>.some ..host_dependency_parser)
+                    (<>.some ..library_parser)
+                    ..target_parser
+                    ..module_parser))
       (<>.after (cli.this "export")
                 ($_ <>.and
-                    (<>.some ..^source)
-                    ..^target))
+                    (<>.some ..source_parser)
+                    ..target_parser))
       ))
 
 (def: #export target
   (-> Service Target)
-  (|>> (case> (^or (#Compilation [sources libraries target module])
-                   (#Interpretation [sources libraries target module])
+  (|>> (case> (^or (#Compilation [sources host_dependencies libraries target module])
+                   (#Interpretation [sources host_dependencies libraries target module])
                    (#Export [sources target]))
               target)))
-- 
cgit v1.2.3