about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2019-12-07 15:26:05 -0800
committerKartik Agaram <vc@akkartik.com>2019-12-07 18:06:16 -0800
commit72f278ae6bb52e17dbdeac0fce41a794e8dfd0d1 (patch)
tree37a9447622b24894ccb2006b027b61b3b8b8fab8
parentc1d596f56a6f2198ea8ea1b0a90c613e919d891b (diff)
downloadmu-72f278ae6bb52e17dbdeac0fce41a794e8dfd0d1.tar.gz
5797 - move `enumerate/` to `tools/` directory
-rwxr-xr-xbuild8
-rwxr-xr-xclean2
-rw-r--r--enumerate/Readme1
-rw-r--r--tools/Readme.md8
-rw-r--r--tools/enumerate.cc (renamed from enumerate/enumerate.cc)0
5 files changed, 13 insertions, 6 deletions
diff --git a/build b/build
index 9e95bb34..114fb7cd 100755
--- a/build
+++ b/build
@@ -72,8 +72,8 @@ noisy_cd() {
   echo "-- `pwd`" >&2
 }
 
-older_than enumerate/enumerate enumerate/enumerate.cc && {
-  $CXX $CFLAGS enumerate/enumerate.cc -o enumerate/enumerate
+older_than tools/enumerate tools/enumerate.cc && {
+  $CXX $CFLAGS tools/enumerate.cc -o tools/enumerate
 }
 
 older_than tangle/tangle tangle/*.cc && {
@@ -92,8 +92,8 @@ older_than tangle/tangle tangle/*.cc && {
   noisy_cd ..  # no effect; just to show us returning to the parent directory
 }
 
-LAYERS=$(enumerate/enumerate --until $UNTIL_LAYER  |grep '.cc$')
-older_than subx.cc $LAYERS enumerate/enumerate tangle/tangle && {
+LAYERS=$(tools/enumerate --until $UNTIL_LAYER  |grep '.cc$')
+older_than subx.cc $LAYERS tools/enumerate tangle/tangle && {
   # no update here; rely on 'update' calls downstream
   tangle/tangle $LAYERS  > subx.cc
 }
diff --git a/clean b/clean
index 567d6152..6e83d27a 100755
--- a/clean
+++ b/clean
@@ -5,7 +5,7 @@ set -v
 rm -rf subx.cc subx_bin* *_list
 rm -rf .until
 test $# -gt 0 && exit 0  # convenience: 'clean top-level' to leave subsidiary tools alone
-rm -rf enumerate/enumerate tangle/tangle tangle/*_list */*.dSYM
+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 tmp mu-linux.iso outfs initrd.fat mu-soso.iso
diff --git a/enumerate/Readme b/enumerate/Readme
deleted file mode 100644
index 2e0649f9..00000000
--- a/enumerate/Readme
+++ /dev/null
@@ -1 +0,0 @@
-Tool used in Mu's build process.
diff --git a/tools/Readme.md b/tools/Readme.md
index 3a24955b..2649ef72 100644
--- a/tools/Readme.md
+++ b/tools/Readme.md
@@ -1,5 +1,13 @@
 Run all these from the top-level `mu/` directory.
 
+### Some tools for Mu's build process
+
+These are built automatically.
+
+* `enumerate`: list numeric files in current directory, optionally `--until`
+  some prefix.
+
+
 ### Miscellaneous odds and ends
 
 These are built lazily.
diff --git a/enumerate/enumerate.cc b/tools/enumerate.cc
index 2777c407..2777c407 100644
--- a/enumerate/enumerate.cc
+++ b/tools/enumerate.cc