Simplify build process.

.github/workflows/main.yml

@@ -18,12 +18,5 @@ jobs:
           distribution: 'temurin'
           java-version: '21'
           cache: 'gradle'
-      - name: Build fray (no tests)
-        run: ./gradlew build -x test
-      - name: Instrument JDK
-        run: ./gradlew jlink
-      - name: Build shadow JAR
-        run: ./gradlew shadowJar
-      - name: Test fray
-        run: ./gradlew test
-
+      - name: Build fray and run tests
+        run: ./gradlew build

core/build.gradle.kts

@@ -28,3 +28,7 @@ tasks.named<ShadowJar>("shadowJar") {
         attributes(mapOf("Main-Class" to "cmu.pasta.fray.core.MainKt"))
     }
 }
+
+tasks.named("build") {
+  dependsOn("shadowJar")
+}

instrumentation/build.gradle.kts

@@ -26,9 +26,7 @@ tasks.withType<JavaExec> {
   jvmArgs("--patch-module", "cmu.pasta.fray.instrumentation=${sourceSets["main"].output.asPath}")
 }
 
-
 tasks.compileJava {
-  println(sourceSets["main"].output.asPath)
   options.compilerArgumentProviders.add(CommandLineArgumentProvider {
     // Provide compiled Kotlin classes to javac – needed for Java/Kotlin mixed sources to work
     listOf("--patch-module", "cmu.pasta.fray.instrumentation=${sourceSets["main"].output.asPath}")
@@ -42,8 +40,6 @@ tasks.jar {
 }
 
 tasks.named<ShadowJar>("shadowJar") {
-  // In Kotlin DSL, setting properties is done through Kotlin property syntax.
-//    isEnableRelocation = true
   relocate("org.objectweb.asm", "cmu.pasta.fray.instrumentation.asm")
   manifest {
     attributes(mapOf("Premain-Class" to "cmu.pasta.fray.instrumentation.PreMainKt"))
@@ -53,3 +49,8 @@ tasks.named<ShadowJar>("shadowJar") {
 tasks.test {
   useJUnitPlatform()
 }
+
+tasks.named("build") {
+  dependsOn("shadowJar")
+}
+

integration-tests/build.gradle.kts

@@ -25,6 +25,8 @@ tasks.test {
   executable("${jdk.layout.buildDirectory.get().asFile}/java-inst/bin/java")
   jvmArgs("-agentpath:$agentPath")
   jvmArgs("-javaagent:${instrumentation.layout.buildDirectory.get().asFile}/libs/${instrumentation.name}-${instrumentation.version}-all.jar")
+  dependsOn(":jdk:build")
+  dependsOn(":jvmti:build")
 }
 
 tasks.register<Copy>("copyDependencies") {

jdk/build.gradle.kts

@@ -30,34 +30,37 @@ tasks.jar {
     manifest {
         attributes(mapOf("Premain-Class" to "cmu.pasta.fray.jdk.agent.AgentKt"))
     }
-
     dependsOn("copyDependencies")
 }
 
+tasks.build {
+  dependsOn("jar")
+  val path = "${layout.buildDirectory.get().asFile}/libs"
+  val jdkPath = "${layout.buildDirectory.get().asFile}/java-inst"
+  outputs.dirs(jdkPath)
+  doLast {
+    println(state)
+    if (!state.upToDate) {
+      exec {
+        if (File(jdkPath).exists()) {
+          delete(file(jdkPath))
+        }
+        var runtimeJar = "$path/${project.name}-$version.jar"
+        val jarDir = file(path)
+
+        val jars = jarDir.listFiles { file -> file.extension == "jar" }
+            ?.joinToString(separator = ":") { it.absolutePath }
+          ?: "No JAR files found."
+        val command = listOf("jlink", "-J-javaagent:$runtimeJar", "-J--module-path=$jars",
+            "-J--add-modules=cmu.pasta.fray.jdk", "-J--class-path=$jars",
+            "--output=$jdkPath", "--add-modules=ALL-MODULE-PATH",  "--fray-instrumentation")
+        commandLine(command)
+      }
+    }
+  }
+}
+
 tasks.register<Copy>("copyDependencies") {
     from(configurations.runtimeClasspath)
     into("${layout.buildDirectory.get().asFile}/libs")
 }
-
-
-tasks.register<Exec>("jlink") {
-  var path = "${layout.buildDirectory.get().asFile}/libs"
-  var jdkPath = "${layout.buildDirectory.get().asFile}/java-inst"
-  /* delete(file(jdkPath)) */
-
-  if (!File(jdkPath).exists()) {
-    var runtimeJar = "$path/${project.name}-$version.jar"
-    val jarDir = file(path)
-
-    val jars = jarDir.listFiles { file -> file.extension == "jar" }
-        ?.joinToString(separator = ":") { it.absolutePath }
-      ?: "No JAR files found."
-    val command = listOf("jlink", "-J-javaagent:$runtimeJar", "-J--module-path=$jars",
-        "-J--add-modules=cmu.pasta.fray.jdk", "-J--class-path=$jars",
-        "--output=$jdkPath", "--add-modules=ALL-MODULE-PATH",  "--fray-instrumentation")
-    println(command.joinToString(" "))
-    commandLine(command)
-    /* commandLine(listOf("java", "--version")) */
-    dependsOn(tasks.jar)
-  }
-}

jdk/src/main/kotlin/cmu/pasta/fray/jdk/jlink/JlinkPlugin.kt

@@ -28,6 +28,7 @@ class JlinkPlugin : Plugin {
 
   override fun transform(input: ResourcePool, output: ResourcePoolBuilder): ResourcePool {
     println("Start fray plugin!")
+
     Utils.prepareDebugFolder("jdk")
     Utils.prepareDebugFolder("origin")
     input.transformAndCopy(

examples/build.gradle.kts → junit-runner/build.gradle.kts

@@ -64,38 +64,8 @@ tasks.compileJava {
   options.compilerArgs.addAll(listOf("--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED"))
 }
 
-tasks.register<JavaExec>("runExample") {
-  args = listOf("example.Main", "-o", "${layout.buildDirectory.get().asFile}/report", "--scheduler", "fifo")
-}
-
-tasks.register<JavaExec>("runJC") {
-  val cp = properties["classpath"] as String? ?: ""
-  val main = properties["mainClass"] as String? ?: ""
-  val extraArgs = when (val extraArgs = properties["extraArgs"]) {
-    is String -> extraArgs.split(" ")
-    else -> emptyList()
-  }
-  classpath += files(cp.split(":"))
-  args = listOf(main, "main", "-o", "${layout.buildDirectory.get().asFile}/report", "--logger", "csv", "--iter", "10000", "-s", "10000000") + extraArgs
-}
-
 tasks.register<Copy>("copyDependencies") {
   from(configurations.runtimeClasspath)
   into("${layout.buildDirectory.get().asFile}/dependency")
 }
 
-
-fun resolveClasspath(classpath: String): List<String> {
-  return classpath.split(":").flatMap { path ->
-    if (path.contains("*")) {
-      val dir = File(path.substringBeforeLast("/"))
-      val pattern = path.substringAfterLast("/")
-      dir.listFiles { _, name -> name.matches(Regex(pattern.replace("*", ".*"))) }
-          ?.map { it.absolutePath }
-        ?: emptyList()
-    } else {
-      listOf(File(path).absolutePath)
-    }
-  }
-}
-

examples/src/main/java/cmu/pasta/fray/examples/JUnitRunner.java → junit-runner/src/main/java/cmu/pasta/fray/runner/JUnitRunner.java

@@ -1,4 +1,4 @@
-package cmu.pasta.fray.examples;
+package cmu.pasta.fray.runner;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

settings.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 rootProject.name = "fray"
 include("jdk")
 include("runtime")
-include("examples")
+include("junit-runner")
 include("jvmti")
 include("core")
 include("instrumentation")