From 71a06696d93eaeacb98e07ff2c55636b04194b3a Mon Sep 17 00:00:00 2001 From: gtrepta <50716988+gtrepta@users.noreply.github.com> Date: Tue, 3 Oct 2023 15:02:49 -0500 Subject: [PATCH] Packaging: Move `version` into lib/kframework (#3683) For #3675 We're installing `version` into `/usr/lib/version`. This change moves it to `/usr/lib/kframework/version`. Co-authored-by: rv-jenkins --- k-distribution/src/main/assembly/bin.xml | 2 +- kernel/src/main/java/org/kframework/utils/file/JarInfo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/k-distribution/src/main/assembly/bin.xml b/k-distribution/src/main/assembly/bin.xml index 3ea8529e2bd..d322cd42ab8 100644 --- a/k-distribution/src/main/assembly/bin.xml +++ b/k-distribution/src/main/assembly/bin.xml @@ -69,7 +69,7 @@ ${project.parent.basedir}/package - /lib + /lib/kframework version diff --git a/kernel/src/main/java/org/kframework/utils/file/JarInfo.java b/kernel/src/main/java/org/kframework/utils/file/JarInfo.java index 5661f04c76e..adc55aebe1c 100644 --- a/kernel/src/main/java/org/kframework/utils/file/JarInfo.java +++ b/kernel/src/main/java/org/kframework/utils/file/JarInfo.java @@ -85,7 +85,7 @@ public void printVersionMessage() { // the release version if we're not (e.g. from a release tarball). String version = mf.getMainAttributes().getValue("Implementation-Git-Describe"); if (version.isEmpty()) { - version = "v" + FileUtils.readFileToString(new File(kBase + "/lib/version")).trim(); + version = "v" + FileUtils.readFileToString(new File(kBase + "/lib/kframework/version")).trim(); } System.out.println("K version: " + version);