Merge branch 'develop' into new-debugger-flag-in-krun

runtimeverification · Oct 4, 2023 · d17623d · d17623d
2 parents 079c231 + 71a0669
commit d17623d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/k-distribution/src/main/assembly/bin.xml b/k-distribution/src/main/assembly/bin.xml
@@ -69,7 +69,7 @@
     </fileSet>
     <fileSet>
       <directory>${project.parent.basedir}/package</directory>
-      <outputDirectory>/lib</outputDirectory>
+      <outputDirectory>/lib/kframework</outputDirectory>
       <includes>
         <include>version</include>
       </includes>

diff --git 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);