Fixes the tasks

eisop · Jan 7, 2025 · 725d331 · 725d331
1 parent 07c8377
commit 725d331
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -66,6 +66,8 @@ ext {
     plumeScriptsHome = "${project(':checker').projectDir}/bin-devel/.plume-scripts"
     htmlToolsHome = "${project(':checker').projectDir}/bin-devel/.html-tools"
     doLikeJavacHome = "${project(':checker').projectDir}/bin/.do-like-javac"
+    templateforCheckerDir = "${parentDir}/templatefora-checker"
+    demosDir = "${parentDir}/checker-framework.demos"
 
     javadocMemberLevel = JavadocMemberLevel.PROTECTED
 
@@ -865,7 +867,8 @@ createCloneTask('getGitScripts', 'https://github.com/eisop-plume-lib/git-scripts
 createCloneTask('getPlumeScripts', 'https://github.com/eisop-plume-lib/plume-scripts.git', plumeScriptsHome)
 createCloneTask('getHtmlTools', 'https://github.com/plume-lib/html-tools.git', htmlToolsHome)
 createCloneTask('getDoLikeJavac', 'https://github.com/opprop/do-like-javac.git', doLikeJavacHome)
-
+createCloneTask('getTemplatefora-checker', 'https://github.com/eisop/templatefora-checker.git', templateforCheckerDir)
+createCloneTask('getDemos', 'https://github.com/eisop/checker-framework.demos.git', demosDir)
 
 // No group so it does not show up in the output of `gradlew tasks`
 task pythonIsInstalled(type: Exec) {

diff --git a/checker/build.gradle b/checker/build.gradle
@@ -327,8 +327,10 @@ task demosTests(dependsOn: assembleForJavac, group: 'Verification') {
     def injected = project.objects.newInstance(InjectedExecOps)
 
     doLast {
-        File demosDir = new File(projectDir, '../../checker-framework.demos');
-        createCloneTask('getDemos', 'https://github.com/eisop/checker-framework.demos.git', demosDir)
+        injected.execOps.exec {
+            workingDir = rootDir
+            commandLine "./gradlew", "getDemos"
+        }
         ant.properties.put('checker.lib', file("${projectDir}/dist/checker.jar").absolutePath)
         ant.ant(dir: demosDir.toString())
     }
@@ -340,8 +342,10 @@ task templateTests(dependsOn: assembleForJavac, group: 'Verification') {
     def injected = project.objects.newInstance(InjectedExecOps)
 
     doLast {
-        File templateforCheckerDir = new File(projectDir, '../../templatefora-checker');
-        createCloneTask('getTemplatefora-checker', 'https://github.com/eisop/templatefora-checker.git', templateforCheckerDir)
+        injected.execOps.exec {
+            workingDir = rootDir
+            commandLine "./gradlew", "getTemplatefora-checker"
+        }
         println "Running Gradle build in $templateforCheckerDir"
         injected.execOps.exec {
             workingDir = templateforCheckerDir