3 files changed, 63 insertions, 13 deletions
diff --git a/dev/Coq_Bugzilla_autolink.user.js b/dev/Coq_Bugzilla_autolink.user.js
index 371c5adc0..5ff618a83 100644
--- a/dev/Coq_Bugzilla_autolink.user.js
+++ b/dev/Coq_Bugzilla_autolink.user.js
@@ -10,25 +10,59 @@
 var regex = /BZ#(\d+)/g;
 var substr = '<a href="https://coq.inria.fr/bugs/show_bug.cgi?id=$1">$&</a>';
 
-function doNode(node)
+function doTitle(node)
 {
     node.innerHTML = node.innerHTML.replace(regex,substr);
 }
 
+function filter(node)
+{
+  if (node.nodeName == '#text')
+    {
+      return NodeFilter.FILTER_ACCEPT;
+    }
+  else if(node.nodeName == 'A')
+    {
+      return NodeFilter.FILTER_REJECT;
+    }
+  return NodeFilter.FILTER_SKIP;
+}
 var comments = document.getElementsByClassName("comment-body");
 
-for(var i=0; i<comments.length; i++)
+function doNode(parent)
 {
-    var pars = comments[i].getElementsByTagName("p");
-    for(var j=0; j<pars.length; j++)
+    var nodes = document.createTreeWalker(parent,NodeFilter.SHOW_ALL,{ acceptNode : filter },false);
+    var node;
+    while(node=nodes.nextNode())
     {
-        doNode(pars[j]);
+      var content = node.textContent;
+      var matches = regex.exec(content);
+
+      if(matches && matches.length > 1)
+      {
+        var range = document.createRange();
+        var start = content.search(regex);
+        var end = start + matches[0].length;
+        range.setStart(node, start);
+        range.setEnd(node, end);
+        var linkNode = document.createElement("a");
+        linkNode.href = "https://coq.inria.fr/bugs/show_bug.cgi?id=" + matches[1];
+        range.surroundContents(linkNode);
+
+        //handle multiple matches in one text node
+        doNode(linkNode.parentNode);
+      }
     }
 }
 
+for(var i=0; i<comments.length; i++)
+{
+  doNode(comments[i]);
+}
+
 // usually 1 or 0 titles...
 var titles = document.getElementsByClassName("js-issue-title");
 for(var i=0; i<titles.length; i++)
 {
-    doNode(titles[i]);
+    doTitle(titles[i]);
 }
diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh
index 43525dcd4..545846da5 100644
--- a/dev/ci/ci-basic-overlay.sh
+++ b/dev/ci/ci-basic-overlay.sh
@@ -43,6 +43,9 @@
 : ${Iris_CI_BRANCH:=master}
 : ${Iris_CI_GITURL:=https://gitlab.mpi-sws.org/FP/iris-coq.git}
 
+: ${lambdaRust_CI_BRANCH:=master}
+: ${lambdaRust_CI_GITURL:=https://gitlab.mpi-sws.org/FP/LambdaRust-coq.git}
+
 ########################################################################
 # HoTT
 ########################################################################
diff --git a/dev/ci/ci-iris-coq.sh b/dev/ci/ci-iris-lambda-rust.sh
index c49b6ed9c..cf24d202d 100755
--- a/dev/ci/ci-iris-coq.sh
+++ b/dev/ci/ci-iris-lambda-rust.sh
@@ -4,25 +4,38 @@ ci_dir="$(dirname "$0")"
 source ${ci_dir}/ci-common.sh
 
 stdpp_CI_DIR=${CI_BUILD_DIR}/coq-stdpp
-
 Iris_CI_DIR=${CI_BUILD_DIR}/iris-coq
+lambdaRust_CI_DIR=${CI_BUILD_DIR}/lambdaRust
 
 install_ssreflect
 
 # Add or update the opam repo we need for dependency resolution
 opam repo add iris-dev https://gitlab.mpi-sws.org/FP/opam-dev.git -p 0 || opam update iris-dev
 
-# Setup Iris first, extract required version of std++
-git_checkout ${Iris_CI_BRANCH} ${Iris_CI_GITURL} ${Iris_CI_DIR}
-stdpp_VERSION=$(cat ${Iris_CI_DIR}/opam | fgrep coq-stdpp | egrep 'dev\.([0-9.-]+)' -o)
+# Setup lambdaRust first
+git_checkout ${lambdaRust_CI_BRANCH} ${lambdaRust_CI_GITURL} ${lambdaRust_CI_DIR}
+
+# Extract required version of Iris
+Iris_VERSION=$(cat ${lambdaRust_CI_DIR}/opam | fgrep coq-iris | egrep 'dev\.([0-9.-]+)' -o)
+Iris_URL=$(opam show coq-iris.$Iris_VERSION -f upstream-url)
+read -a Iris_URL_PARTS <<< $(echo $Iris_URL | tr '#' ' ')
+
+# Setup Iris
+git_checkout ${Iris_CI_BRANCH} ${Iris_URL_PARTS[0]} ${Iris_CI_DIR} ${Iris_URL_PARTS[1]}
 
-# Ask opam where to get this std++, separating at the #
+# Extract required version of std++
+stdpp_VERSION=$(cat ${Iris_CI_DIR}/opam | fgrep coq-stdpp | egrep 'dev\.([0-9.-]+)' -o)
 stdpp_URL=$(opam show coq-stdpp.$stdpp_VERSION -f upstream-url)
 read -a stdpp_URL_PARTS <<< $(echo $stdpp_URL | tr '#' ' ')
 
 # Setup std++
 git_checkout ${stdpp_CI_BRANCH} ${stdpp_URL_PARTS[0]} ${stdpp_CI_DIR} ${stdpp_URL_PARTS[1]}
+
+# Build std++
 ( cd ${stdpp_CI_DIR} && make && make install )
 
-# Build iris now
-( cd ${Iris_CI_DIR} && make )
+# Build iris
+( cd ${Iris_CI_DIR} && make && make install )
+
+# Build lambdaRust
+( cd ${lambdaRust_CI_DIR} && make && make install )