Skip to content

Commit

Permalink
Use standalone z3-turnkey dependency instead of jar files (#402)
Browse files Browse the repository at this point in the history
  • Loading branch information
zcai1 authored Jun 15, 2022
1 parent 21dfba4 commit a61ae54
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 77 deletions.
12 changes: 2 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ ext {
checkerFrameworkPath = System.getenv('CHECKERFRAMEWORK') ?: "${jsr308}/checker-framework"
checkerJar = "${checkerFrameworkPath}/checker/dist/checker.jar"
afu = "${jsr308}/annotation-tools/annotation-file-utilities"
z3Jar = "${projectDir}/lib/com.microsoft.z3.jar"
lingelingTar = "${projectDir}/lib/lingeling.tar.gz"
dljcScript = "${jsr308}/do-like-javac/dljc"

Expand Down Expand Up @@ -67,7 +66,8 @@ dependencies {

implementation 'org.ow2.sat4j:org.ow2.sat4j.core:2.3.6'
implementation 'org.ow2.sat4j:org.ow2.sat4j.maxsat:2.3.6'
implementation files(z3Jar)

implementation 'tools.aqua:z3-turnkey:4.8.17'

testImplementation fileTree(dir: "${checkerFrameworkPath}/framework-test/build/libs", include: "framework-test-*.jar")
// Mocking library. Used in a couple tests
Expand All @@ -94,13 +94,6 @@ sourceSets {
}
}

task buildZ3(type: Exec) {
description 'Build Z3 solver'
onlyIf { !(new File(z3Jar).exists()) }
workingDir './scripts'
commandLine './buildZ3'
}

task buildLingeling(type: Exec) {
description 'Build Lingeling solver'
onlyIf { !(new File(lingelingTar).exists()) }
Expand Down Expand Up @@ -163,7 +156,6 @@ test {
}

compileJava {
dependsOn(buildZ3)
dependsOn(buildLingeling)
dependsOn(buildDLJC)
options.compilerArgs = [
Expand Down
67 changes: 0 additions & 67 deletions scripts/buildZ3

This file was deleted.

0 comments on commit a61ae54

Please sign in to comment.