aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2022-02-03 10:31:44 -0800
committerKartik Agaram <vc@akkartik.com>2022-02-03 10:31:44 -0800
commit54423826c740f14aee37c37002b57a1c276867e1 (patch)
treeea066f041e630de2cc78bf8259af9258647f05d2
parent38a93706739b864c67fc3107ec862dee4440c875 (diff)
downloadmu-54423826c740f14aee37c37002b57a1c276867e1.tar.gz
update stale stuff in an old prototype
-rwxr-xr-xarchive/1.vm/build06
-rwxr-xr-xarchive/1.vm/build112
-rwxr-xr-xarchive/1.vm/build218
-rwxr-xr-xarchive/1.vm/build318
-rwxr-xr-xarchive/1.vm/build436
-rwxr-xr-xarchive/1.vm/clean2
6 files changed, 46 insertions, 46 deletions
diff --git a/archive/1.vm/build0 b/archive/1.vm/build0
index 03ac8180..fcee74d3 100755
--- a/archive/1.vm/build0
+++ b/archive/1.vm/build0
@@ -4,7 +4,7 @@
set -v
set -e # stop immediately on error
-cd ../../tools
+cd ../../linux/bootstrap/tools
# auto-generate various lists (ending in '_list' by convention) {
# list of function declarations, so I can define them in any order
grep -h "^[^ #].*) {" tangle.cc |sed 's/ {.*/;/' > tangle.function_list
@@ -14,7 +14,7 @@ cd ../../tools
# }
g++ -std=c++98 -g -O3 tangle.cc -o tangle
./tangle test
-cd ../archive/1.vm
+cd ../../../archive/1.vm
cd termbox
gcc -g -O2 -c termbox.c
@@ -22,7 +22,7 @@ cd termbox
ar rcs libtermbox.a *.o
cd ..
-../../tools/tangle [0-9]*.cc > mu.cc
+../../linux/bootstrap/tools/tangle [0-9]*.cc > mu.cc
# auto-generate function declarations, so I can define them in any order
# functions start out unindented, have all args on the same line, and end in ') {'
#
diff --git a/archive/1.vm/build1 b/archive/1.vm/build1
index 6d427c7a..accf949e 100755
--- a/archive/1.vm/build1
+++ b/archive/1.vm/build1
@@ -21,9 +21,9 @@ export CXXFLAGS="-std=c++98 $CFLAGS" # CI has an ancient version; don't expect
# (layers) | |
# tangle $CXX
-$CXX $CFLAGS ../../tools/enumerate.cc -o ../../tools/enumerate
+$CXX $CFLAGS ../../linux/bootstrap/tools/enumerate.cc -o ../../linux/bootstrap/tools/enumerate
-cd ../../tools
+cd ../../linux/bootstrap/tools
# auto-generate various lists (ending in '_list' by convention) {
# list of function declarations, so I can define them in any order
grep -h "^[^ #].*) {" tangle.cc |sed 's/ {.*/;/' > tangle.function_list
@@ -33,7 +33,7 @@ cd ../../tools
# }
$CXX $CXXFLAGS tangle.cc -o tangle
./tangle test
-cd ../archive/1.vm
+cd ../../../archive/1.vm
cd termbox
$CC $CFLAGS -c termbox.c
@@ -41,8 +41,8 @@ cd termbox
ar rcs libtermbox.a *.o
cd ..
-LAYERS=$(../../tools/enumerate --until $UNTIL_LAYER |grep '\.cc$')
-../../tools/tangle $LAYERS > mu.cc
+LAYERS=$(../../linux/bootstrap/tools/enumerate --until $UNTIL_LAYER |grep '\.cc$')
+../../linux/bootstrap/tools/tangle $LAYERS > mu.cc
# auto-generate function declarations, so I can define them in any order
# functions start out unindented, have all args on the same line, and end in ') {'
#
@@ -55,5 +55,5 @@ $CXX $CXXFLAGS mu.cc termbox/libtermbox.a -o mu_bin
## [0-9]*.mu -> core.mu
-MU_LAYERS=$(../../tools/enumerate --until $UNTIL_LAYER |grep '\.mu$') || exit 0 # ok if no .mu files
+MU_LAYERS=$(../../linux/bootstrap/tools/enumerate --until $UNTIL_LAYER |grep '\.mu$') || exit 0 # ok if no .mu files
cat $MU_LAYERS > core.mu
diff --git a/archive/1.vm/build2 b/archive/1.vm/build2
index e0383fa5..be79b008 100755
--- a/archive/1.vm/build2
+++ b/archive/1.vm/build2
@@ -81,12 +81,12 @@ noisy_cd() {
echo "-- `pwd`" >&2
}
-older_than ../../tools/enumerate ../../tools/enumerate.cc && {
- $CXX $CXXFLAGS ../../tools/enumerate.cc -o ../../tools/enumerate
+older_than ../../linux/bootstrap/tools/enumerate ../../linux/bootstrap/tools/enumerate.cc && {
+ $CXX $CXXFLAGS ../../linux/bootstrap/tools/enumerate.cc -o ../../linux/bootstrap/tools/enumerate
}
-older_than ../../tools/tangle ../../tools/tangle.cc && {
- noisy_cd ../../tools
+older_than ../../linux/bootstrap/tools/tangle ../../linux/bootstrap/tools/tangle.cc && {
+ noisy_cd ../../linux/bootstrap/tools
# auto-generate various lists (ending in '_list' by convention) {
# list of function declarations, so I can define them in any order
grep -h "^[^ #].*) {" tangle.cc |sed 's/ {.*/;/' |update tangle.function_list
@@ -96,13 +96,13 @@ older_than ../../tools/tangle ../../tools/tangle.cc && {
# }
$CXX $CFLAGS tangle.cc -o tangle
./tangle test
- noisy_cd ../archive/1.vm # no effect; just to show us returning to the parent directory
+ noisy_cd ../../../archive/1.vm # no effect; just to show us returning to the parent directory
}
-LAYERS=$(../../tools/enumerate --until $UNTIL_LAYER |grep '\.cc$')
-older_than mu.cc $LAYERS ../../tools/enumerate ../../tools/tangle && {
+LAYERS=$(../../linux/bootstrap/tools/enumerate --until $UNTIL_LAYER |grep '\.cc$')
+older_than mu.cc $LAYERS ../../linux/bootstrap/tools/enumerate ../../linux/bootstrap/tools/tangle && {
# no update here; rely on 'update' calls downstream
- ../../tools/tangle $LAYERS > mu.cc
+ ../../linux/bootstrap/tools/tangle $LAYERS > mu.cc
}
older_than cleave/cleave cleave/cleave.cc && {
@@ -150,7 +150,7 @@ older_than mu_bin mu.cc *_list cleave/cleave termbox/* && {
## [0-9]*.mu -> core.mu
-MU_LAYERS=$(../../tools/enumerate --until $UNTIL_LAYER |grep '\.mu$') || exit 0 # ok if no .mu files
+MU_LAYERS=$(../../linux/bootstrap/tools/enumerate --until $UNTIL_LAYER |grep '\.mu$') || exit 0 # ok if no .mu files
cat $MU_LAYERS |update core.mu
exit 0
diff --git a/archive/1.vm/build3 b/archive/1.vm/build3
index 11f8afc8..87dc4a21 100755
--- a/archive/1.vm/build3
+++ b/archive/1.vm/build3
@@ -106,12 +106,12 @@ noisy_cd() {
echo "-- `pwd`" >&2
}
-older_than ../../tools/enumerate ../../tools/enumerate.cc && {
- $CXX $CXXFLAGS ../../tools/enumerate.cc -o ../../tools/enumerate
+older_than ../../linux/bootstrap/tools/enumerate ../../linux/bootstrap/tools/enumerate.cc && {
+ $CXX $CXXFLAGS ../../linux/bootstrap/tools/enumerate.cc -o ../../linux/bootstrap/tools/enumerate
}
-older_than ../../tools/tangle ../../tools/tangle.cc && {
- noisy_cd ../../tools
+older_than ../../linux/bootstrap/tools/tangle ../../linux/bootstrap/tools/tangle.cc && {
+ noisy_cd ../../linux/bootstrap/tools
# auto-generate various lists (ending in '_list' by convention) {
# list of function declarations, so I can define them in any order
grep -h "^[^ #].*) {" tangle.cc |sed 's/ {.*/;/' |update tangle.function_list
@@ -121,13 +121,13 @@ older_than ../../tools/tangle ../../tools/tangle.cc && {
# }
$CXX $CFLAGS tangle.cc -o tangle
./tangle test
- noisy_cd ../archive/1.vm # no effect; just to show us returning to the parent directory
+ noisy_cd ../../../archive/1.vm # no effect; just to show us returning to the parent directory
}
-LAYERS=$(../../tools/enumerate --until $UNTIL_LAYER |grep '\.cc$')
-older_than mu.cc $LAYERS ../../tools/enumerate ../../tools/tangle && {
+LAYERS=$(../../linux/bootstrap/tools/enumerate --until $UNTIL_LAYER |grep '\.cc$')
+older_than mu.cc $LAYERS ../../linux/bootstrap/tools/enumerate ../../linux/bootstrap/tools/tangle && {
# no update here; rely on 'update' calls downstream
- ../../tools/tangle $LAYERS > mu.cc
+ ../../linux/bootstrap/tools/tangle $LAYERS > mu.cc
}
older_than cleave/cleave cleave/cleave.cc && {
@@ -175,7 +175,7 @@ older_than mu_bin mu.cc *_list cleave/cleave termbox/* && {
## [0-9]*.mu -> core.mu
-MU_LAYERS=$(../../tools/enumerate --until $UNTIL_LAYER |grep '\.mu$') || exit 0 # ok if no .mu files
+MU_LAYERS=$(../../linux/bootstrap/tools/enumerate --until $UNTIL_LAYER |grep '\.mu$') || exit 0 # ok if no .mu files
cat $MU_LAYERS |update core.mu
exit 0
diff --git a/archive/1.vm/build4 b/archive/1.vm/build4
index dec46810..34ff0615 100755
--- a/archive/1.vm/build4
+++ b/archive/1.vm/build4
@@ -125,24 +125,24 @@ all_exist() {
}
TMP=`mktemp`
-mv_if_exists ../../tools/enumerate $TMP
+mv_if_exists ../../linux/bootstrap/tools/enumerate $TMP
(
- wait_for_all ../../tools/enumerate.cc
- older_than $TMP ../../tools/enumerate.cc && {
+ wait_for_all ../../linux/bootstrap/tools/enumerate.cc
+ older_than $TMP ../../linux/bootstrap/tools/enumerate.cc && {
echo "building enumerate"
- $CXX $CXXFLAGS ../../tools/enumerate.cc -o $TMP || quit
+ $CXX $CXXFLAGS ../../linux/bootstrap/tools/enumerate.cc -o $TMP || quit
echo "done building enumerate"
}
- mv $TMP ../../tools/enumerate
+ mv $TMP ../../linux/bootstrap/tools/enumerate
) &
TMP=`mktemp`
-mv_if_exists ../../tools/tangle $TMP
+mv_if_exists ../../linux/bootstrap/tools/tangle $TMP
(
- wait_for_all ../../tools/tangle.cc
- older_than $TMP ../../tools/tangle.cc && {
+ wait_for_all ../../linux/bootstrap/tools/tangle.cc
+ older_than $TMP ../../linux/bootstrap/tools/tangle.cc && {
echo "building tangle"
- cd ../../tools
+ cd ../../linux/bootstrap/tools
# auto-generate various lists (ending in '_list' by convention) {
# list of function declarations, so I can define them in any order
grep -h "^[^ #].*) {" tangle.cc |sed 's/ {.*/;/' |update tangle.function_list
@@ -153,25 +153,25 @@ mv_if_exists ../../tools/tangle $TMP
# Now that we have all the _lists, compile 'tangle'
$CXX $CXXFLAGS tangle.cc -o $TMP || quit
$TMP test
- cd ../archive/1.vm
+ cd ../../../archive/1.vm
echo "done building tangle"
}
- mv $TMP ../../tools/tangle
+ mv $TMP ../../linux/bootstrap/tools/tangle
) &
-wait_for_all ../../tools/enumerate
+wait_for_all ../../linux/bootstrap/tools/enumerate
echo "enumerating layers"
-LAYERS=$(../../tools/enumerate --until $UNTIL_LAYER |grep '\.cc$')
+LAYERS=$(../../linux/bootstrap/tools/enumerate --until $UNTIL_LAYER |grep '\.cc$')
echo "done enumerating layers"
TMP=`mktemp`
mv_if_exists mu.cc $TMP
(
- wait_for_all $LAYERS ../../tools/enumerate ../../tools/tangle
- older_than $TMP $LAYERS ../../tools/enumerate ../../tools/tangle && {
+ wait_for_all $LAYERS ../../linux/bootstrap/tools/enumerate ../../linux/bootstrap/tools/tangle
+ older_than $TMP $LAYERS ../../linux/bootstrap/tools/enumerate ../../linux/bootstrap/tools/tangle && {
echo "running tangle"
# no update here; rely on 'update' calls downstream
- ../../tools/tangle $LAYERS >$TMP || quit
+ ../../linux/bootstrap/tools/tangle $LAYERS >$TMP || quit
echo "done running tangle"
}
mv $TMP mu.cc
@@ -273,9 +273,9 @@ mv_if_exists mu_bin $TMP
## [0-9]*.mu -> core.mu
-wait_for_all ../../tools/enumerate
+wait_for_all ../../linux/bootstrap/tools/enumerate
echo "building core.mu"
-MU_LAYERS=$(../../tools/enumerate --until $UNTIL_LAYER |grep '\.mu$') || exit 0 # ok if no .mu files
+MU_LAYERS=$(../../linux/bootstrap/tools/enumerate --until $UNTIL_LAYER |grep '\.mu$') || exit 0 # ok if no .mu files
cat $MU_LAYERS |update core.mu
echo "done building core.mu"
diff --git a/archive/1.vm/clean b/archive/1.vm/clean
index c49c2ddc..e2d10bf4 100755
--- a/archive/1.vm/clean
+++ b/archive/1.vm/clean
@@ -6,4 +6,4 @@ rm -rf mu.cc core.mu mu_bin* *_list .build
rm -rf termbox/*.o termbox/libtermbox.a
rm -rf .until .quit
test $# -gt 0 && exit 0 # convenience: 'clean top-level' to leave subsidiary tools alone
-rm -rf ../../tools/enumerate ../../tools/tangle ../../tools/*_list cleave/cleave cleave/cleave.dSYM ../../*/*.dSYM
+rm -rf ../../linux/bootstrap/tools/enumerate ../../linux/bootstrap/tools/tangle ../../linux/bootstrap/tools/*_list cleave/cleave cleave/cleave.dSYM ../../linux/bootstrap/tools/*.dSYM