Fix JavaSieve which is using configure and make wrappers commands

ktoso · ktoso · commit cf0ea10e9503 · 2025-06-13T11:30:30.000+09:00
diff --git a/.swift-version b/.swift-version
diff --git a/Plugins/SwiftJavaPlugin/SwiftJavaPlugin.swift b/Plugins/SwiftJavaPlugin/SwiftJavaPlugin.swift
@@ -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
     ]
   }
   
diff --git a/Samples/JavaSieve/Package.swift b/Samples/JavaSieve/Package.swift
@@ -54,7 +54,7 @@ let package = Package(
               .product(name: "JavaKit", package: "swift-java"),
               .product(name: "JavaKitJar", package: "swift-java"),
             ],
-            exclude: ["swift-java.config"],
+//            exclude: ["swift-java.config"],
             swiftSettings: [
               .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
             ],
@@ -72,7 +72,7 @@ let package = Package(
                 .product(name: "JavaKit", package: "swift-java"),
                 .product(name: "JavaKitCollection", package: "swift-java"),
             ],
-            exclude: ["swift-java.config"],
+//            exclude: ["swift-java.config"],
             swiftSettings: [
               .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
             ],
diff --git a/Samples/JavaSieve/Sources/JavaSieve/main.swift b/Samples/JavaSieve/Sources/JavaSieve/main.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)")
 }
diff --git a/Samples/JavaSieve/Sources/JavaSieve/swift-java.config b/Samples/JavaSieve/Sources/JavaSieve/swift-java.config
@@ -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"
+  }
 }
+
diff --git a/Sources/SwiftJavaTool/SwiftJava.swift b/Sources/SwiftJavaTool/SwiftJava.swift
@@ -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
diff --git a/Sources/SwiftJavaTool/SwiftJavaBaseAsyncParsableCommand.swift b/Sources/SwiftJavaTool/SwiftJavaBaseAsyncParsableCommand.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
diff --git a/Tests/JExtractSwiftTests/Asserts/TextAssertions.swift b/Tests/JExtractSwiftTests/Asserts/TextAssertions.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,

Original file line number	Diff line number	Diff line change
`@@ -181,29 +181,29 @@ struct SwiftJavaBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`if !outputSwiftFiles.isEmpty {`
	`184`	`+ let displayName = "Wrapping \(classes.count) Java classes in Swift target '\(sourceModule.name)'"`
	`185`	`+ log("Prepared: \(displayName)")`
`184`	`186`	`commands += [`
`185`	`187`	`.buildCommand(`
`186`		`- displayName: "Wrapping \(classes.count) Java classes in Swift target '\(sourceModule.name)'",`
	`188`	`+ displayName: displayName,`
`187`	`189`	`executable: executable,`
`188`	`190`	`arguments: arguments,`
`189`		`- inputFiles: compiledClassFiles + fetchDependenciesOutputFiles + [`
`190`		`- configFile`
`191`		`- ],`
	`191`	`+ inputFiles: compiledClassFiles + fetchDependenciesOutputFiles + [ configFile ],`
`192`	`192`	`outputFiles: outputSwiftFiles`
`193`	`193`	`)`
`194`	`194`	`]`
`195`	`195`	`} else {`
`196`	`196`	`log("No Swift output files, skip wrapping")`
`197`	`197`	`}`
`198`		`-`
	`198`	`+`
`199`	`199`	`return commands`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`extension SwiftJavaBuildToolPlugin {`
`204`	`204`	`func argumentsModuleName(sourceModule: Target) -> [String] {`
`205`	`205`	`return [`
`206`		`- "--swift-module", sourceModule.name`
	`206`	`+ "--swift-module", sourceModule.name`
`207`	`207`	`]`
`208`	`208`	`}`
`209`	`209`