Truffle dsl processor issue (#332)

Co-authored-by: Benjamin Gaidioz <ben@raw-labs.com> Co-authored-by: Alex Zerntev <alex.zerntev@raw-labs.com>
raw-labs · Jan 22, 2024 · bfbe75b · bfbe75b
1 parent 84de886
commit bfbe75b
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 14 deletions.
diff --git a/hard-rebuild.sh b/hard-rebuild.sh
@@ -24,7 +24,7 @@ sbt clean publishLocal
 
 cd ../snapi-truffle
 rm -rf target/
-sbt clean publishLocal
+sbt clean runJavaAnnotationProcessor publishLocal
 
 cd ../snapi-client
 rm -rf target/

diff --git a/snapi-frontend/src/main/java/module-info.java b/snapi-frontend/src/main/java/module-info.java
@@ -83,6 +83,7 @@
   exports raw.compiler.rql2.errors;
   exports raw.compiler.rql2.lsp;
   exports raw.compiler.rql2.source;
+  exports raw.compiler.rql2.antlr4;
   exports raw.compiler.utils;
   exports raw.inferrer.api;
   exports raw.inferrer.local;

diff --git a/snapi-parser/build.sbt b/snapi-parser/build.sbt
@@ -129,9 +129,7 @@ Compile / packageSrc / publishArtifact := true
 
 // Dependencies
 libraryDependencies ++= Seq(
-  // We depend directly on the Truffle DSL processor to use their Antlr4.
-  // If we'd use ours, they would conflict as Truffle DSL package defines the org.antlr4 package.
-  "org.graalvm.truffle" % "truffle-dsl-processor" % "23.1.0"
+  "org.antlr" % "antlr4-runtime" % "4.12.0"
 )
 
 val generateParser = taskKey[Unit]("Generated antlr4 base parser and lexer")

diff --git a/snapi-parser/src/main/java/module-info.java b/snapi-parser/src/main/java/module-info.java
@@ -11,7 +11,7 @@
  */
 
 module raw.snapi.parser {
-  requires truffle.dsl.processor;
-
   exports raw.compiler.rql2.generated;
+
+  requires org.antlr.antlr4.runtime;
 }
diff --git a/snapi-truffle/build.sbt b/snapi-truffle/build.sbt
@@ -1,11 +1,10 @@
-import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
+import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.*
+import sbt.Keys.*
+import sbt.*
 
-import sbt.Keys._
-import sbt._
+import Dependencies.*
 
-import java.time.Year
-
-import Dependencies._
+import scala.sys.process.Process
 
 ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org"
 
@@ -87,6 +86,12 @@ Test / doc / sources := {
   (Compile / doc / sources).value.filterNot(_.getName.endsWith(".java"))
 }
 
+Compile / unmanagedSourceDirectories += baseDirectory.value / "target" / "java-processed-sources"
+
+Compile / unmanagedResourceDirectories += baseDirectory.value / "target" / "java-processed-sources" / "META-INF"
+
+Compile / resourceDirectories += baseDirectory.value / "target" / "java-processed-sources" / "META-INF"
+
 // Add all the classpath to the module path.
 Compile / javacOptions ++= Seq(
   "--module-path",
@@ -121,6 +126,66 @@ Test / javaOptions ++= Seq(
   "-Dpolyglotimpl.CompilationFailureAction=Throw"
 )
 
+val annotationProcessors = Seq(
+  "com.oracle.truffle.dsl.processor.TruffleProcessor",
+  "com.oracle.truffle.dsl.processor.verify.VerifyTruffleProcessor",
+  "com.oracle.truffle.dsl.processor.LanguageRegistrationProcessor",
+  "com.oracle.truffle.dsl.processor.InstrumentRegistrationProcessor",
+  "com.oracle.truffle.dsl.processor.OptionalResourceRegistrationProcessor",
+  "com.oracle.truffle.dsl.processor.InstrumentableProcessor",
+  "com.oracle.truffle.dsl.processor.verify.VerifyCompilationFinalProcessor",
+  "com.oracle.truffle.dsl.processor.OptionProcessor"
+).mkString(",")
+
+val calculateClasspath = taskKey[Seq[File]]("Calculate the full classpath")
+
+calculateClasspath := {
+  val dependencyFiles = (Compile / dependencyClasspath).value.files
+  val unmanagedFiles = (Compile / unmanagedClasspath).value.files
+  val classesDir = (Compile / classDirectory).value
+
+  dependencyFiles ++ unmanagedFiles ++ Seq(classesDir)
+}
+
+val runJavaAnnotationProcessor = taskKey[Unit]("Runs the Java annotation processor")
+
+runJavaAnnotationProcessor := {
+  println("Running Java annotation processor")
+
+  val annotationProcessorJar = baseDirectory.value / "truffle-dsl-processor-23.1.0.jar"
+
+  val javaSources = baseDirectory.value / "src" / "main" / "java"
+  val targetDir = baseDirectory.value / "target" / "java-processed-sources"
+
+  val projectClasspath = calculateClasspath.value.mkString(":")
+
+  val javacOptions = Seq(
+    "javac",
+    "-source",
+    "21",
+    "-target",
+    "21",
+    "-d",
+    targetDir.getAbsolutePath,
+    "--module-path",
+    projectClasspath,
+    "-cp",
+    annotationProcessorJar.getAbsolutePath,
+    "-processor",
+    annotationProcessors,
+    "-proc:only"
+  ) ++ (javaSources ** "*.java").get.map(_.absolutePath)
+
+  // Create the target directory if it doesn't exist
+  targetDir.mkdirs()
+
+  // Execute the Java compiler
+  val result = Process(javacOptions).!
+  if (result != 0) {
+    throw new RuntimeException("Java annotation processing failed.")
+  }
+}
+
 // Add dependency resolvers
 resolvers += Resolver.mavenLocal
 resolvers += Resolver.sonatypeRepo("releases")

diff --git a/snapi-truffle/build.sh b/snapi-truffle/build.sh
@@ -7,4 +7,4 @@ yes | sdk install java 21.0.1-graalce || true
 sdk use java 21.0.1-graalce
 
 cd "$SCRIPT_HOME"
-sbt clean publishLocal
+sbt clean runJavaAnnotationProcessor publishLocal
diff --git a/snapi-truffle/project/Dependencies.scala b/snapi-truffle/project/Dependencies.scala
@@ -10,7 +10,6 @@ object Dependencies {
 
   val truffleCompiler = Seq(
     "org.graalvm.truffle" % "truffle-api" % "23.1.0",
-    "org.graalvm.truffle" % "truffle-dsl-processor" % "23.1.0" % Provided,
     "org.graalvm.truffle" % "truffle-api" % "23.1.0",
     "org.graalvm.truffle" % "truffle-compiler" % "23.1.0",
     "org.graalvm.truffle" % "truffle-nfi" % "23.1.0",

diff --git a/snapi-truffle/truffle-dsl-processor-23.1.0.jar b/snapi-truffle/truffle-dsl-processor-23.1.0.jar