Merge remote-tracking branch 'origin/develop'

runtimeverification · Nov 29, 2023 · abe5602 · abe5602
2 parents 31b502b + f708c08
commit abe5602
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/k-distribution/src/main/assembly/bin.xml b/k-distribution/src/main/assembly/bin.xml
@@ -7,7 +7,7 @@
   <baseDirectory>k</baseDirectory>
     <dependencySets>
       <dependencySet>
-        <outputDirectory>/bin</outputDirectory>
+        <outputDirectory>/lib/kframework/bin</outputDirectory>
         <includes>
           <include>*:uexe:${native.os.classifier}:*</include>
         </includes>

diff --git a/k-distribution/src/main/scripts/lib/checkJava b/k-distribution/src/main/scripts/lib/checkJava
@@ -23,17 +23,18 @@ function setarch {
   fi
 }
 
+NG="$(dirname "${BASH_SOURCE[0]}")/bin/ng"
 KSERVER_SOCKET="${KSERVER_SOCKET:-$HOME/.kserver}"
-KSERVER_INSTANCE="ng --nailgun-server local:$KSERVER_SOCKET/socket"
+KSERVER_INSTANCE="$NG --nailgun-server local:$KSERVER_SOCKET/socket"
 version=$($KSERVER_INSTANCE org.kframework.main.JavaVersion 2>&1)
 if [ $? -eq 0 ]; then
   setarch
   JAVA="$KSERVER_INSTANCE"
 else
-  version=$(ng org.kframework.main.JavaVersion 2>&1)
+  version=$($NG org.kframework.main.JavaVersion 2>&1)
   if [ $? -eq 0 ]; then
     setarch
-    JAVA=ng
+    JAVA=$NG
   else
     version=$("$_java" -version 2>&1)
     setarch

diff --git a/nix/k.nix b/nix/k.nix
@@ -104,7 +104,7 @@ let
       '';
 
       preFixup = lib.optionalString (!stdenv.isDarwin) ''
-        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin-unwrapped/ng"
+        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/lib/kframework/bin/ng"
       '';
 
       passthru =