Fix JavaSieve which is using configure and make wrappers commands

Author: ktoso

.swift-version

@@ -181,29 +181,29 @@ struct SwiftJavaBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
     }
 
     if !outputSwiftFiles.isEmpty {
+      let displayName = "Wrapping \(classes.count) Java classes in Swift target '\(sourceModule.name)'"
+      log("Prepared: \(displayName)")
       commands += [
         .buildCommand(
-          displayName: "Wrapping \(classes.count) Java classes in Swift target '\(sourceModule.name)'",
+          displayName: displayName,
           executable: executable,
           arguments: arguments,
-          inputFiles: compiledClassFiles + fetchDependenciesOutputFiles + [
-            configFile
-          ],
+          inputFiles: compiledClassFiles + fetchDependenciesOutputFiles + [ configFile ],
           outputFiles: outputSwiftFiles
         )
       ]
     } else {
       log("No Swift output files, skip wrapping")
     }
-    
+
     return commands
   }
 }
 
 extension SwiftJavaBuildToolPlugin {
   func argumentsModuleName(sourceModule: Target) -> [String] {
     return [
-     "--swift-module", sourceModule.name
+      "--swift-module", sourceModule.name
     ]
   }
 

Plugins/SwiftJavaPlugin/SwiftJavaPlugin.swift

@@ -15,18 +15,15 @@
 import JavaKit
 import JavaMath
 
-let jvm = try JavaVirtualMachine.shared(classpath: [
-  "quadratic-sieve-Java/build/libs/QuadraticSieve-1.0.jar",
-  ".",
-])
+let jvm = try JavaVirtualMachine.shared()
 
 do {
   let sieveClass = try JavaClass<SieveOfEratosthenes>(environment: jvm.environment())
   for prime in sieveClass.findPrimes(100)! {
     print("Found prime: \(prime.intValue())")
   }
 
-  try JavaClass<RoundingMode>().HALF_UP
+  _ = try JavaClass<RoundingMode>().HALF_UP // can import a Java enum value
 } catch {
   print("Failure: \(error)")
 }

Samples/JavaSieve/Sources/JavaSieve/main.swift

@@ -1,6 +1,32 @@
 {
+  "classpath" : ".:quadratic-sieve-Java/build/libs/QuadraticSieve-1.0.jar",
   "classes" : {
-
-  },
-  "classpath" : ""
+    "com.gazman.quadratic_sieve.QuadraticSieve" : "QuadraticSieve",
+    "com.gazman.quadratic_sieve.core.BaseFact" : "BaseFact",
+    "com.gazman.quadratic_sieve.core.matrix.GaussianEliminationMatrix" : "GaussianEliminationMatrix",
+    "com.gazman.quadratic_sieve.core.matrix.Matrix" : "Matrix",
+    "com.gazman.quadratic_sieve.core.poly.PolyMiner" : "PolyMiner",
+    "com.gazman.quadratic_sieve.core.poly.WheelPool" : "WheelPool",
+    "com.gazman.quadratic_sieve.core.siever.BSmoothData" : "BSmoothData",
+    "com.gazman.quadratic_sieve.core.siever.BSmoothDataPool" : "BSmoothDataPool",
+    "com.gazman.quadratic_sieve.core.siever.Siever" : "Siever",
+    "com.gazman.quadratic_sieve.core.siever.VectorExtractor" : "VectorExtractor",
+    "com.gazman.quadratic_sieve.data.BSmooth" : "BSmooth",
+    "com.gazman.quadratic_sieve.data.DataQueue" : "DataQueue",
+    "com.gazman.quadratic_sieve.data.MagicNumbers" : "MagicNumbers",
+    "com.gazman.quadratic_sieve.data.PolynomialData" : "PolynomialData",
+    "com.gazman.quadratic_sieve.data.PrimeBase" : "PrimeBase",
+    "com.gazman.quadratic_sieve.data.VectorData" : "VectorData",
+    "com.gazman.quadratic_sieve.data.VectorWorkData" : "VectorWorkData",
+    "com.gazman.quadratic_sieve.debug.Analytics" : "Analytics",
+    "com.gazman.quadratic_sieve.debug.AssertUtils" : "AssertUtils",
+    "com.gazman.quadratic_sieve.debug.AssertUtils$Tester" : "AssertUtils.Tester",
+    "com.gazman.quadratic_sieve.debug.Logger" : "Logger",
+    "com.gazman.quadratic_sieve.fact.TrivialDivision" : "TrivialDivision",
+    "com.gazman.quadratic_sieve.primes.BigPrimes" : "BigPrimes",
+    "com.gazman.quadratic_sieve.primes.SieveOfEratosthenes" : "SieveOfEratosthenes",
+    "com.gazman.quadratic_sieve.utils.MathUtils" : "MathUtils",
+    "com.gazman.quadratic_sieve.wheel.Wheel" : "Wheel"
+  }
 }
+

Samples/JavaSieve/Sources/JavaSieve/swift-java.config

@@ -90,9 +90,9 @@ struct SwiftJava: SwiftJavaBaseAsyncParsableCommand { // FIXME: this is just a n
     }
   }
 
-//  @Argument(
-//    help: "The input file, which is either a Java2Swift configuration file or (if '-jar' was specified) a Jar file."
-//  )
+  @Argument(
+    help: "The input file, which is either a Java2Swift configuration file or (if '-jar' was specified) a Jar file."
+  )
   var input: String? // FIXME: top level command cannot have input argument like this
 
   // FIXME: this is subcommands
@@ -172,6 +172,7 @@ struct SwiftJava: SwiftJavaBaseAsyncParsableCommand { // FIXME: this is just a n
     print("[debug][swift-java] Running swift-java in mode: " + "\(toolMode.prettyName)".bold)
 
     let swiftModule: String =
+      self.swiftModule ??
       self.effectiveSwiftModule.split(separator: "/").dropLast().last.map(String.init) ?? "__UnknownModule"
 
     // Load all of the dependent configurations and associate them with Swift

Sources/SwiftJavaTool/SwiftJava.swift

@@ -110,14 +110,14 @@ extension SwiftJavaBaseAsyncParsableCommand {
 extension SwiftJavaBaseAsyncParsableCommand {
 
   var moduleBaseDir: Foundation.URL? {
-    if let outputDirectory = commonOptions.outputDirectory {
-      if outputDirectory == "-" {
-        return nil
-      }
-
-      print("[debug][swift-java] Module base directory based on outputDirectory!")
-      return URL(fileURLWithPath: outputDirectory)
-    }
+//    if let outputDirectory = commonOptions.outputDirectory {
+//      if outputDirectory == "-" {
+//        return nil
+//      }
+//
+//      print("[debug][swift-java] Module base directory based on outputDirectory!")
+//      return URL(fileURLWithPath: outputDirectory)
+//    }
 
 //    guard let swiftModule else {
 //      return nil

Sources/SwiftJavaTool/SwiftJavaBaseAsyncParsableCommand.swift

@@ -34,7 +34,6 @@ func assertOutput(
   column: Int = #column
 ) throws {
   try! translator.analyze(file: "/fake/Fake.swiftinterface", text: input)
-  self.log.logLevel = translator.log.logLevel
 
   let generator = FFMSwift2JavaGenerator(
     translator: translator,