From cb921f67c3f87c0934f7969f24cd6deab70e8574 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 Aug 2014 19:01:14 +0200 Subject: [PATCH] Remove log2html.xsl and friends It's part of Hydra now. --- src/nix-log2xml/local.mk | 3 -- src/nix-log2xml/log2html.xsl | 83 --------------------------------- src/nix-log2xml/mark-errors.xsl | 24 ---------- src/nix-log2xml/treebits.js | 50 -------------------- tests/common.sh.in | 1 - tests/logging.sh | 9 ---- 6 files changed, 170 deletions(-) delete mode 100644 src/nix-log2xml/log2html.xsl delete mode 100644 src/nix-log2xml/mark-errors.xsl delete mode 100644 src/nix-log2xml/treebits.js diff --git a/src/nix-log2xml/local.mk b/src/nix-log2xml/local.mk index 46eb2e02c..09c848c17 100644 --- a/src/nix-log2xml/local.mk +++ b/src/nix-log2xml/local.mk @@ -3,6 +3,3 @@ programs += nix-log2xml nix-log2xml_DIR := $(d) nix-log2xml_SOURCES := $(d)/log2xml.cc - -$(foreach file, mark-errors.xsl log2html.xsl treebits.js, \ - $(eval $(call install-data-in, $(d)/$(file), $(datadir)/nix/log2html))) diff --git a/src/nix-log2xml/log2html.xsl b/src/nix-log2xml/log2html.xsl deleted file mode 100644 index 209399470..000000000 --- a/src/nix-log2xml/log2html.xsl +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - -
    - - - - linelastline - -
  • - - - - -
    • -     -
- - - - - - - - - error - - - - - - - - - - /... - - - - \ No newline at end of file diff --git a/src/nix-log2xml/mark-errors.xsl b/src/nix-log2xml/mark-errors.xsl deleted file mode 100644 index 4e91913e5..000000000 --- a/src/nix-log2xml/mark-errors.xsl +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/nix-log2xml/treebits.js b/src/nix-log2xml/treebits.js deleted file mode 100644 index 3011b391d..000000000 --- a/src/nix-log2xml/treebits.js +++ /dev/null @@ -1,50 +0,0 @@ -/* Acknowledgement: this is based on the Wikipedia table-of-contents - * toggle. */ - - -var idCounter = 0; - - -function showTreeToggle(isHidden) { - if (document.getElementById) { - var id = "toggle_" + idCounter; - document.writeln( - '' + - '+' + - '-' + - ''); - idCounter = idCounter + 1; - } -} - - -function toggleTree(id) { - - var href = document.getElementById(id); - - var node = href; - var tree = null; - while (node != null) { - if (node.className == "nesting") tree = node; - node = node.nextSibling; - } - - node = href.firstChild; - var hideTree = null; - var showTree = null; - while (node != null) { - if (node.className == "showTree") showTree = node; - else if (node.className == "hideTree") hideTree = node; - node = node.nextSibling; - } - - if (tree.style.display == 'none') { - tree.style.display = ''; - hideTree.style.display = ''; - showTree.style.display = 'none'; - } else { - tree.style.display = 'none'; - hideTree.style.display = 'none'; - showTree.style.display = ''; - } -} diff --git a/tests/common.sh.in b/tests/common.sh.in index 48ca7d2dd..8581223b3 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -23,7 +23,6 @@ export PATH=@bindir@:$PATH export NIX_BUILD_HOOK= export dot=@dot@ export xmllint="@xmllint@" -export xsltproc="@xsltproc@" export SHELL="@bash@" export version=@PACKAGE_VERSION@ diff --git a/tests/logging.sh b/tests/logging.sh index 5ba71c3e4..0113ed11c 100644 --- a/tests/logging.sh +++ b/tests/logging.sh @@ -14,15 +14,6 @@ if test "$xmllint" != "false"; then $xmllint --noout $TEST_ROOT/log.xml || fail "malformed XML" fi -# Convert to HTML. -if test "$xsltproc" != "false"; then - (cd $datadir/nix/log2html && $xsltproc mark-errors.xsl - | $xsltproc log2html.xsl -) < $TEST_ROOT/log.xml > $TEST_ROOT/log.html - # Ideally we would check that the generated HTML is valid... - - # A few checks... - grep ".*FOO" $TEST_ROOT/log.html || fail "bad HTML output" -fi - # Test nix-store -l. [ "$(nix-store -l $path)" = FOO ]