From 79afcdfae1ca972c1b31dc62f899b34aef3dd039 Mon Sep 17 00:00:00 2001 From: Guy Repta <50716988+gtrepta@users.noreply.github.com> Date: Fri, 29 Sep 2023 17:01:21 -0500 Subject: [PATCH] Move 'version' under lib/kframework --- 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);