From fe0d7449e5f8c777226aea32b8e3b475fe243f39 Mon Sep 17 00:00:00 2001 From: Levente Bajczi Date: Sun, 20 Oct 2024 19:34:00 +0200 Subject: [PATCH 1/3] Added thorn creation to action --- .github/workflows/linux-build-test-deploy.yml | 5 +++++ build.gradle.kts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux-build-test-deploy.yml b/.github/workflows/linux-build-test-deploy.yml index 80040fd800..6d5b209e16 100644 --- a/.github/workflows/linux-build-test-deploy.yml +++ b/.github/workflows/linux-build-test-deploy.yml @@ -105,6 +105,11 @@ jobs: with: name: "EmergenTheta" inputflag: "--algorithm EMERGENT" + - name: Create thorn.zip + uses: ./.github/actions/build-archive + with: + name: "Thorn" + inputflag: "--algorithm HORN" javadoc: diff --git a/build.gradle.kts b/build.gradle.kts index 20a45bf13f..108baa86d1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,7 +28,7 @@ buildscript { allprojects { group = "hu.bme.mit.theta" - version = "6.6.0" + version = "6.6.1" apply(from = rootDir.resolve("gradle/shared-with-buildSrc/mirrors.gradle.kts")) } From 9709d84c0d5b06160a3b0858762843d3a4350474 Mon Sep 17 00:00:00 2001 From: Levente Bajczi Date: Sun, 20 Oct 2024 20:19:16 +0200 Subject: [PATCH 2/3] Added support for --svcomp shorthand --- .../main/java/hu/bme/mit/theta/xcfa/cli/XcfaCli.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/XcfaCli.kt b/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/XcfaCli.kt index f5257effa4..a8652b79ea 100644 --- a/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/XcfaCli.kt +++ b/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/XcfaCli.kt @@ -41,6 +41,9 @@ class XcfaCli(private val args: Array) { @Parameter(names = ["--help", "-h"], help = true) private var help = false + @Parameter(names = ["--svcomp"]) + private var svcomp = false + @Parameter var remainingFlags: MutableList = ArrayList() @@ -55,6 +58,17 @@ class XcfaCli(private val args: Array) { } else { config = XcfaConfig() } + if (svcomp) { + remainingFlags.addAll( + listOf( + "--enable-output", + "--disable-xcfa-serialization", + "--disable-chc-serialization", + "--disable-c-serialization", + "--only-svcomp-witness" + ) + ) + } while (remainingFlags.isNotEmpty()) { val nextArgs = remainingFlags.toTypedArray() remainingFlags.clear() From aca85baf4991e2d085a30c3c8734cbc0284d4655 Mon Sep 17 00:00:00 2001 From: Levente Bajczi Date: Sun, 20 Oct 2024 20:25:40 +0200 Subject: [PATCH 3/3] Disabling arg serialization if --svcomp is given --- .../xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/XcfaCli.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/XcfaCli.kt b/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/XcfaCli.kt index a8652b79ea..54e2c0d406 100644 --- a/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/XcfaCli.kt +++ b/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/XcfaCli.kt @@ -63,6 +63,7 @@ class XcfaCli(private val args: Array) { listOf( "--enable-output", "--disable-xcfa-serialization", + "--disable-arg-generation", "--disable-chc-serialization", "--disable-c-serialization", "--only-svcomp-witness"