Update dependency: deps/k_release (#308)

* deps/k_release: v5.1.171 * deps/k_release: v5.1.172 * deps/k_release: v5.1.173 * Fixes for the nix packaging. * deps/k_release: v5.1.180 Co-authored-by: Theodoros Kasampalis <[email protected]>
runtimeverification · Sep 13, 2021 · 41a47d6 · 41a47d6
1 parent 4c9e09a
commit 41a47d6
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -124,7 +124,7 @@ endif # ifndef SYSTEM_LIBSECP256K1
 ifndef SYSTEM_LIBCRYPTOPP
 
 ifeq ($(UNAME_S),Darwin)
-libcryptopp_out := $(IELE_LIB)/libcryptopp: libcryptopp.a
+libcryptopp_out := $(IELE_LIB)/libcryptopp
 endif
 
 cryptopp: $(libcryptopp_out)
@@ -430,6 +430,29 @@ all_lib_sources := $(shell find $(IELE_LIB) -type f
                             -not -path "$(IELE_LIB)/standalone/iele-testing-kompiled/dt/*" \
                             | sed 's|^$(IELE_LIB)/||')
 
+iele_interpreter_libs := $(shell find $(IELE_LIB)/standalone -type f                       \
+                            -not -path "$(IELE_LIB)/*.cmi"                                 \
+                            -not -path "$(IELE_LIB)/*.cmx"                                 \
+                            -not -path "$(IELE_LIB)/*.ml"                                  \
+                            -not -path "$(IELE_LIB)/*.mli"                                 \
+                            -not -path "$(IELE_LIB)/*.o"                                   \
+                            -not -path "$(IELE_LIB)/standalone/iele-testing-kompiled/dt/*" \
+                            | sed 's|^$(IELE_LIB)/||')
+
+iele_check_libs := $(shell find $(IELE_LIB)/check -type f                                  \
+                            -not -path "$(IELE_LIB)/*.cmi"                                 \
+                            -not -path "$(IELE_LIB)/*.cmx"                                 \
+                            -not -path "$(IELE_LIB)/*.ml"                                  \
+                            -not -path "$(IELE_LIB)/*.mli"                                 \
+                            -not -path "$(IELE_LIB)/*.o"                                   \
+                            -not -path "$(IELE_LIB)/check/well-formedness-kompiled/dt/*"   \
+                            | sed 's|^$(IELE_LIB)/||')
+
+kiele_files := kiele-generate-report.py \
+               kore-json.py             \
+               static-report.html       \
+               version
+
 $(DESTDIR)$(INSTALL_BIN)/%: $(IELE_BIN)/%
 	@mkdir -p $(dir $@)
 	$(INSTALL) $< $@
@@ -438,6 +461,15 @@ $(DESTDIR)$(INSTALL_LIB)/%: $(IELE_LIB)/%
 	@mkdir -p $(dir $@)
 	$(INSTALL) $< $@
 
+install-interpreter: $(patsubst %, $(DESTDIR)$(INSTALL_LIB)/%, $(iele_interpreter_libs))
+
+install-vm: $(patsubst $(IELE_LIB)/%, $(DESTDIR)$(INSTALL_LIB)/%, $(IELE_VM))
+
+install-check: $(patsubst %, $(DESTDIR)$(INSTALL_LIB)/%, $(iele_check_libs))
+
+install-kiele: $(patsubst $(IELE_BIN)/%, $(DESTDIR)$(INSTALL_BIN)/%, $(IELE_RUNNER))
+install-kiele: $(patsubst %, $(DESTDIR)$(INSTALL_LIB)/%, $(kiele_files))
+
 install: $(patsubst %, $(DESTDIR)$(INSTALL_BIN)/%, $(all_bin_sources)) \
          $(patsubst %, $(DESTDIR)$(INSTALL_LIB)/%, $(all_lib_sources))
 

diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-v5.1.170
+v5.1.180
diff --git a/nix/kiele.nix b/nix/kiele.nix
@@ -31,7 +31,6 @@ let
     src = cleanSourceWith {
       name = "iele-semantics";
       inherit src;
-      ignore = [ "kiele" ];
     };
     nativeBuildInputs = [ protobuf k haskell-backend llvm-backend clang ];
     buildInputs = [ cryptopp libff mpfr secp256k1 ];
@@ -69,16 +68,14 @@ stdenv.mkDerivation {
 
     patchShebangs kore-json.py
   '';
-  buildPhase = "true";
+  buildFlags = [ "build-kiele" ];
   installTargets = [ "install-kiele" ];
   postInstall = ''
     ln -s ${lib.getBin iele-assemble}/bin/iele-assemble $out/bin
-    ln -s ${lib.getBin iele-check}/bin/iele-check $out/bin
-    ln -s ${lib.getBin iele-interpreter}/bin/iele-interpreter $out/bin
-    ln -s ${lib.getBin iele-vm}/bin/iele-vm $out/bin
 
     ln -s ${lib.getLib iele-interpreter}/lib/kiele/standalone $out/lib/kiele
     ln -s ${lib.getLib iele-check}/lib/kiele/check $out/lib/kiele
+    ln -s ${lib.getLib iele-vm}/lib/kiele/node $out/lib/kiele
   '';
   passthru = { inherit iele-assemble iele-check iele-interpreter iele-vm; };
 }