Merge branch 'master' into drop-kprovex

runtimeverification · Jun 23, 2022 · e2694e2 · e2694e2
2 parents b5c0c5f + b111e3d
commit e2694e2
Show file tree

Hide file tree

Showing 63 changed files with 3,348 additions and 621 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,8 @@
 *.pdf
 *.swp
 *.kore
+*.mobi
+*.epub
 .metadata
 .recommenders
 .cache
@@ -24,4 +26,4 @@ target/
 kore/doc
 __pycache__
 result*
-.envrc
+.envrc
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,12 @@
 FROM ubuntu:bionic
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+ENV TZ=American/Chicago
+
+RUN ln -fs /usr/share/zoneinfo/America/Chicago /etc/localtime
+RUN    apt-get update          \
+    && apt-get upgrade --yes   \
+    && DEBIAN_FRONTEND=noninteractive apt-get install --yes tzdata
 
 RUN    apt-get update        \
     && apt-get install --yes \
@@ -25,6 +33,8 @@ RUN    apt-get update        \
         python               \
         python3              \
         python3-graphviz     \
+        texlive-xetex        \
+        wget                 \
         zlib1g-dev
 
 RUN    git clone 'https://github.com/z3prover/z3' --branch=z3-4.8.15 \
@@ -41,6 +51,9 @@ RUN    apt-get update               \
     && apt-get upgrade --yes        \
     && apt-get install --yes nodejs
 
+RUN wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sh /dev/stdin
+RUN wget https://github.com/jgm/pandoc/releases/download/2.18/pandoc-2.18-1-amd64.deb -O /tmp/pandoc.deb && dpkg -i /tmp/pandoc.deb
+
 RUN curl -sSL https://get.haskellstack.org/ | sh
 
 ARG USER_ID=1000

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -473,6 +473,7 @@ pipeline {
               cd web
               npm install
               npm run build
+              npm run build-book
               npm run build-sitemap
               cd -
               mv web/public_content ./

diff --git a/default.nix b/default.nix
@@ -1,14 +1,15 @@
 let
   sources = import ./nix/sources.nix;
-  pinned = import sources."nixpkgs" { config = {}; overlays = [ ( import ./nix/overlays/z3.nix ) ]; };
-in
+  pinned = import sources."nixpkgs" {
+    config = { };
+    overlays = [ (import ./nix/overlays/z3.nix) ];
+  };
 
-{ pkgs ? pinned
+in { pkgs ? pinned
 
-# Build an optimized release package.
-# Currently requires dependents to use LTO. Use sparingly.
-, release ? false
-}:
+  # Build an optimized release package.
+  # Currently requires dependents to use LTO. Use sparingly.
+, release ? false }:
 
 let
   inherit (pkgs) callPackage;
@@ -25,19 +26,42 @@ let
       subDir = "llvm-backend/src/main/native/llvm-backend";
     };
   };
-  inherit (llvm-backend-project) clang llvm-backend;
+  inherit (llvm-backend-project) llvm-backend;
+  inherit (pkgs) clang;
 
   k = callPackage ./nix/k.nix {
+    src = ttuegel.cleanSourceWith {
+      name = "k";
+      src = ttuegel.cleanGit {
+        src = ./.;
+        name = "k";
+      };
+      ignore = [
+        "result*"
+        "nix/"
+        "*.nix"
+        "haskell-backend/src/main/native/haskell-backend/*"
+        "llvm-backend/src/main/native/llvm-backend/*"
+        "!llvm-backend/src/main/native/llvm-backend/matching" # need pom.xml
+        "k-distribution/tests/regression-new"
+      ];
+    };
     inherit haskell-backend llvm-backend mavenix prelude-kore;
-    inherit (ttuegel) cleanGit cleanSourceWith;
+    debugger =
+      if pkgs.system == "x86_64-darwin" || pkgs.system == "aarch64-darwin" then
+        pkgs.lldb
+      else
+        pkgs.gdb;
+    version = pkgs.lib.removeSuffix "\n" (builtins.readFile ./package/version);
   };
 
-  haskell-backend-project = import ./haskell-backend/src/main/native/haskell-backend {
-    src = ttuegel.cleanGitSubtree {
-      src = ./.;
-      subDir = "haskell-backend/src/main/native/haskell-backend";
+  haskell-backend-project =
+    import ./haskell-backend/src/main/native/haskell-backend {
+      src = ttuegel.cleanGitSubtree {
+        src = ./.;
+        subDir = "haskell-backend/src/main/native/haskell-backend";
+      };
     };
-  };
   haskell-backend = haskell-backend-project.kore;
   inherit (haskell-backend-project) prelude-kore;