diff --git a/com.ibm.wala.core.testdata/build.gradle b/com.ibm.wala.core.testdata/build.gradle index 064569806..11c3aaac5 100644 --- a/com.ibm.wala.core.testdata/build.gradle +++ b/com.ibm.wala.core.testdata/build.gradle @@ -48,7 +48,7 @@ clean.dependsOn cleanExtractKawa import org.ajoberstar.gradle.git.tasks.* task getKawaChess(type: GitClone) { - def destination = file("$temporaryDir/kawachess") + def destination = file("kawa-chess") uri = "https://github.com/ttu-fpclub/kawa-chess" destinationPath = destination bare = false @@ -56,7 +56,9 @@ task getKawaChess(type: GitClone) { } task compileChessFiles(type: JavaExec) { - def kawaImg = file('kawa-chess/img.scm') + workingDir = file('kawa-chess') + + def kawaImg = file('kawa-chess/img.scm') def kawaPos = file('kawa-chess/pos.scm') def kawaChess = file('kawa-chess/chess.scm') def kawaGui = file('kawa-chess/gui.scm') @@ -69,8 +71,6 @@ task compileChessFiles(type: JavaExec) { inputs.file kawaJar classpath kawaJar - workingDir = file('kawa-chess') - main 'kawa.repl' args '-C', kawaImg, kawaPos, kawaChess, kawaGui } @@ -79,15 +79,15 @@ compileChessFiles.dependsOn extractKawa compileChessFiles.dependsOn getKawaChess task compileChessMain(type: JavaExec, dependsOn: compileChessFiles) { + workingDir = file("kawa-chess") + def kawaMain = file('kawa-chess/main.scm') inputs.file kawaMain - def kawaJar = new File("${projectDir}/kawa.jar") + def kawaJar = new File("kawa.jar") inputs.file kawaJar classpath kawaJar - workingDir = file('kawa-chess') - main 'kawa.repl' args '--main', '-C', kawaMain } @@ -109,9 +109,7 @@ task compileKawaTestMain(type: JavaExec, dependsOn: extractKawa) { def kawaMain = file('kawasrc/test.scm') inputs.file kawaMain - workingDir = file('kawasrc') - - def kawaJar = new File("${projectDir}/kawa.jar") + def kawaJar = new File("kawa.jar") inputs.file kawaJar classpath kawaJar diff --git a/com.ibm.wala.core.testdata/build.xml b/com.ibm.wala.core.testdata/build.xml index 09929b2c6..54c52584e 100644 --- a/com.ibm.wala.core.testdata/build.xml +++ b/com.ibm.wala.core.testdata/build.xml @@ -115,7 +115,9 @@ - + + + diff --git a/com.ibm.wala.core.testdata/kawasrc/test.scm b/com.ibm.wala.core.testdata/kawasrc/test.scm new file mode 100644 index 000000000..d8a963dfd --- /dev/null +++ b/com.ibm.wala.core.testdata/kawasrc/test.scm @@ -0,0 +1,11 @@ + +(define (doit op args) + (apply op args)) + +(define plusish + (lambda args + (if (= (length args) 1) + (car args) + (+ (car args) (plusish (cdr args)))))) + +(write (doit plusish (list 3 4 5)))