Skip to content

Commit

Permalink
Packaging: Move version into lib/kframework (#3683)
Browse files Browse the repository at this point in the history
For #3675 

We're installing `version` into `/usr/lib/version`. This change moves it
to `/usr/lib/kframework/version`.

Co-authored-by: rv-jenkins <[email protected]>
  • Loading branch information
gtrepta and rv-jenkins authored Oct 3, 2023
1 parent 4051bb3 commit 71a0669
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion k-distribution/src/main/assembly/bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</fileSet>
<fileSet>
<directory>${project.parent.basedir}/package</directory>
<outputDirectory>/lib</outputDirectory>
<outputDirectory>/lib/kframework</outputDirectory>
<includes>
<include>version</include>
</includes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 71a0669

Please sign in to comment.