migrate to shared tool

Author: madsodgaard

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift

@@ -53,7 +53,10 @@ package class FFMSwift2JavaGenerator: Swift2JavaGenerator {
 
   func generate() throws {
     try writeSwiftThunkSources()
+    print("[swift-java] Generated Swift sources (module: '\(self.swiftModuleName)') in: \(swiftOutputDirectory)/")
+
     try writeExportedJavaSources()
+    print("[swift-java] Generated Java sources (package: '\(javaPackage)') in: \(javaOutputDirectory)/")
   }
 }
 

Sources/JExtractSwiftLib/JavaConstants/ForeignValueLayouts.swift renamed to Sources/JExtractSwiftLib/FFM/ForeignValueLayouts.swift

@@ -31,7 +31,6 @@ public struct SwiftToJava {
     }
 
     let translator = Swift2JavaTranslator(
-      javaPackage: config.javaPackage ?? "", // no package is ok, we'd generate all into top level
       swiftModuleName: swiftModule
     )
     translator.log.logLevel = config.logLevel ?? .info
@@ -89,27 +88,18 @@ public struct SwiftToJava {
 
     try translator.analyze()
 
-    switch mode {
-    case .ffm:
+    switch config.mode {
+    case .some(.ffm), .none:
       let generator = FFMSwift2JavaGenerator(
         translator: translator,
-        javaPackage: self.packageName,
-        swiftOutputDirectory: outputDirectorySwift,
-        javaOutputDirectory: outputDirectoryJava
+        javaPackage: config.javaPackage ?? "",
+        swiftOutputDirectory: outputSwiftDirectory,
+        javaOutputDirectory: outputJavaDirectory
       )
 
       try generator.generate()
     }
 
-
-    print("[swift-java] Generated Java sources (\(packageName)) in: \(outputDirectoryJava)/")
-
-    try translator.writeSwiftThunkSources(outputDirectory: outputSwiftDirectory)
-    print("[swift-java] Generated Swift sources (module: '\(config.swiftModule ?? "")') in: \(outputSwiftDirectory)/")
-
-    try translator.writeExportedJavaSources(outputDirectory: outputJavaDirectory)
-    print("[swift-java] Generated Java sources (package: '\(config.javaPackage ?? "")') in: \(outputJavaDirectory)/")
-
     print("[swift-java] Imported Swift module '\(swiftModule)': " + "done.".green)
   }
 

Sources/JExtractSwiftLib/Swift2Java.swift

@@ -38,6 +38,8 @@ public struct Configuration: Codable {
 
   public var outputJavaDirectory: String?
 
+  public var mode: GenerationMode?
+
   // ==== java 2 swift ---------------------------------------------------------
 
   /// The Java class path that should be passed along to the Java2Swift tool.
@@ -255,4 +257,4 @@ extension LogLevel {
       }
     try container.encode(text)
   }
-}
+}

Sources/JavaKitConfigurationShared/Configuration.swift

@@ -12,9 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import ArgumentParser
-
-public enum GenerationMode: String, ExpressibleByArgument {
+public enum GenerationMode: String, Codable {
   /// Foreign Value and Memory API
   case ffm
 }

Sources/JExtractSwiftLib/GenerationMode.swift renamed to Sources/JavaKitConfigurationShared/GenerationMode.swift

@@ -72,6 +72,9 @@ struct SwiftJava: AsyncParsableCommand {
   @Option(help: "The Java package the generated Java code should be emitted into.")
   var javaPackage: String? = nil
 
+  @Option(help: "The mode of generation to use for the output files. Used with jextract mode.")
+  var mode: GenerationMode = .ffm
+
   // TODO: clarify this vs outputSwift (history: outputSwift is jextract, and this was java2swift)
   @Option(name: .shortAndLong, help: "The directory in which to output the generated Swift files or the SwiftJava configuration file.")
   var outputDirectory: String? = nil
@@ -227,6 +230,7 @@ struct SwiftJava: AsyncParsableCommand {
         config.inputSwiftDirectory = self.inputSwift
         config.outputSwiftDirectory = self.outputSwift
         config.outputJavaDirectory = self.outputJava
+        config.mode = self.mode
 
         toolMode = .jextract
       } else if jar {
@@ -512,3 +516,5 @@ extension SwiftJava.ToolMode {
     }
   }
 }
+
+extension GenerationMode: ExpressibleByArgument {}