5799 - move html-generation to `tools/` directory

7 files changed, 7 insertions, 16 deletions

diff --git a/clean b/clean
index 175356e3..ef6e9d4d 100755
--- a/clean
+++ b/clean
@@ -7,6 +7,6 @@ rm -rf .until
 test $# -gt 0 && exit 0  # convenience: 'clean top-level' to leave subsidiary tools alone
 rm -rf tools/enumerate tangle/tangle tangle/*_list */*.dSYM
 rm -rf browse_trace/browse_trace_bin browse_trace/*_list
-rm -rf tools/treeshake
+rm -rf tools/treeshake tools/linkify tools/*.dSYM
 rm -rf tmp_linux mu_linux.iso outfs initrd.fat mu_soso.iso
 ( cd kernel.soso  &&  make clean; )
diff --git a/linkify/Readme b/linkify/Readme
deleted file mode 100644
index c4625a9d..00000000
--- a/linkify/Readme
+++ /dev/null
@@ -1,3 +0,0 @@
-Tool used while rendering Mu's codebase in html. See the mu/update_html script.
-
-Extremely hacky; just see the number of tests.
diff --git a/linkify/build b/linkify/build
deleted file mode 100755
index 3c96ad00..00000000
--- a/linkify/build
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-
-c++ -g linkify.cc -o linkify
diff --git a/linkify/clean b/linkify/clean
deleted file mode 100755
index 3feef907..00000000
--- a/linkify/clean
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-
-rm -rf linkify *.dSYM
diff --git a/tools/Readme.md b/tools/Readme.md
index 2649ef72..29a1a6ef 100644
--- a/tools/Readme.md
+++ b/tools/Readme.md
@@ -12,8 +12,11 @@ These are built automatically.
 
 These are built lazily.
 
+* `linkify`: inserts hyperlinks from variables to definitions in Mu's html
+  sources. Hacky; just see the number of tests. Invoked by `update_html`.
+
 * `treeshake_all`: rebuild SubX binaries without tests and unused functions.
-  Pretty hacky; just helps estimate the code needed to perform various tasks.
+  Hacky; just helps estimate the code needed to perform various tasks.
   ```
   tools/treeshake_all
   ```
diff --git a/linkify/linkify.cc b/tools/linkify.cc
index ece50748..ece50748 100644
--- a/linkify/linkify.cc
+++ b/tools/linkify.cc
diff --git a/update_html b/tools/update_html
index 2c07b476..478d5d6c 100755
--- a/update_html
+++ b/tools/update_html
@@ -4,13 +4,13 @@
 
 set -e
 
-( cd linkify; build; )
+( cd tools; c++ -g linkify.cc -o linkify; )
 
 # generate html/$1.html using /tmp/tags
 process() {
   rm -f html/$1.html
   convert_html $1
-  linkify/linkify /tmp/tags html/$1.html
+  tools/linkify /tmp/tags html/$1.html
   mv html/$1.html.out html/$1.html
 }
 
@@ -71,4 +71,3 @@ do
 done
 
 rm /tmp/tags
-( cd linkify; clean; )