ref: 0b7964943f508c96854b2271b0970ce0b926b397
parent: 98972288339fd5d5f6466557e704f3737eab3c67
author: Ori Bernstein <ori@eigenstate.org>
date: Tue Jun 23 17:32:47 EDT 2015
Update Plan 9 bootstrap script.
--- a/genbootstrap.sh
+++ b/genbootstrap.sh
@@ -1,16 +1,15 @@
#!/bin/sh
-export PATH="`pwd`6:`pwd`/muse:$PATH"
+export PATH="`pwd`:`pwd`6:`pwd`/muse:$PATH"
if test `uname` = Plan9; then
- export MYR_MUSE=6.out
- export MYR_MC=6.out
- export MYR_RT=`pwd`/rt/_myrrt.$O
+ export MYR_MUSE=../muse/6.out
+ export MYR_MC=../6/6.out
+ export MYR_RT=`pwd`/rt/_myrrt.6
else
export MYR_MUSE=muse
export MYR_MC=6m
export MYR_RT=`pwd`/rt/_myrrt.o
fi
-
./mbldwrap.sh
cp mbld/mbld xmbld
./xmbld clean
@@ -20,7 +19,7 @@
bootscript=mk/bootstrap/bootstrap+`uname -s`-`uname -m`.sh
echo '#!/bin/sh' > $bootscript
echo 'pwd=`pwd`' >> $bootscript
-echo 'export PATH=`pwd`/6:`pwd`/muse:$PATH' >> $bootscript
+echo 'export PATH=`pwd`:`pwd`/6:`pwd`/muse:$PATH' >> $bootscript
./xmbld -Rnone | \
sed "s:Entering directory '\\(.*\\)': cd \$pwd/\\1:g" | \
sed "s:Leaving directory.*: cd \$pwd:g" | \
--- a/mbld/bld.sub
+++ b/mbld/bld.sub
@@ -23,9 +23,5 @@
lib ../libregex:regex
;;
-gen config.myr {durable} =- sh -c "cd .. && ./configure --redo"
-;;
-
man = mbld.1;;
--- a/mbldwrap.sh
+++ b/mbldwrap.sh
@@ -1,10 +1,12 @@
#!/bin/sh
-export PATH=`pwd`/6:`pwd`/muse:$PATH
# this should be a bourne compatible shell script.
+export PATH=`pwd`:`pwd`/6:`pwd`/muse:$PATH
if test `uname` = Plan9; then
- export MYR_MUSE=$O.out
- export MYR_MC=$O.out
+ O=6
+ echo $PATH/6/6.out
+ export MYR_MUSE=`pwd`/muse/$O.out
+ export MYR_MC=`pwd`/6/$O.out
export MYR_RT=`pwd`/rt/_myrrt.$O
BOOT="./mk/bootstrap/bootstrap+`uname -s`-`uname -m`.sh"
else
--- a/mk/bootstrap/bootstrap+Plan9-amd64.sh
+++ b/mk/bootstrap/bootstrap+Plan9-amd64.sh
@@ -1,5 +1,6 @@
#!/bin/sh
pwd=`pwd`
+export PATH=`pwd`:`pwd`/6:`pwd`/muse:$PATH
echo cd $pwd/libstd; cd $pwd/libstd
echo ../6/6.out systypes.myr ; ../6/6.out systypes.myr
echo ../6/6.out `$pwd/sysselect.sh sys`; ../6/6.out `$pwd/sysselect.sh sys`
@@ -19,27 +20,17 @@
echo ../6/6.out -I . clear.myr ; ../6/6.out -I . clear.myr
echo ../6/6.out -I . extremum.myr ; ../6/6.out -I . extremum.myr
echo ../6/6.out -I . units.myr ; ../6/6.out -I . units.myr
-echo ../6/6.out -I . alloc.myr ; ../6/6.out -I . alloc.myr
- echo ../6/6.out -I . intparse.myr ; ../6/6.out -I . intparse.myr
-echo ../6/6.out -I . utf.myr ; ../6/6.out -I . utf.myr
-echo ../6/6.out -I . hasprefix.myr; ../6/6.out -I . hasprefix.myr
-echo ../6/6.out -I . `$pwd/sysselect.sh errno`; ../6/6.out -I . `$pwd/sysselect.sh errno`
-echo ../6/6.out -I . cstrconv.myr ; ../6/6.out -I . cstrconv.myr
-echo ../6/6.out -I . `$pwd/sysselect.sh syswrap-ss`; ../6/6.out -I . `$pwd/sysselect.sh syswrap-ss`
-echo ../6/6.out -I . introspect.myr ; ../6/6.out -I . introspect.myr
-echo ../6/6.out -I . varargs.myr ; ../6/6.out -I . varargs.myr
-echo ../6/6.out -I . chartype.myr ; ../6/6.out -I . chartype.myr
-echo ../6/6.out -I . cmp.myr ; ../6/6.out -I . cmp.myr
+echo ../6/6.out -I . alloc.myr ; ../6/6.out -I . alloc.myr
+echo ../6/6.out -I . rand.myr ; ../6/6.out -I . rand.myr
+echo ../6/6.out -I . utf.myr ; ../6/6.out -I . utf.myr
echo ../6/6.out -I . slcp.myr ; ../6/6.out -I . slcp.myr
echo ../6/6.out -I . sldup.myr ; ../6/6.out -I . sldup.myr
-echo ../6/6.out -I . slpush.myr ; ../6/6.out -I . slpush.myr
-echo ../6/6.out -I . bigint.myr ; ../6/6.out -I . bigint.myr
-echo ../6/6.out -I . fltbits.myr ; ../6/6.out -I . fltbits.myr
-echo ../6/6.out -I . fltfmt.myr ; ../6/6.out -I . fltfmt.myr
-echo ../6/6.out -I . fmt.myr ; ../6/6.out -I . fmt.myr
-echo ../6/6.out -I . rand.myr ; ../6/6.out -I . rand.myr
+echo ../6/6.out -I . chartype.myr ; ../6/6.out -I . chartype.myr
+echo ../6/6.out -I . cmp.myr ; ../6/6.out -I . cmp.myr
+echo ../6/6.out -I . hasprefix.myr ; ../6/6.out -I . hasprefix.myr
echo ../6/6.out -I . htab.myr ; ../6/6.out -I . htab.myr
echo ../6/6.out -I . intparse.myr ; ../6/6.out -I . intparse.myr
+echo ../6/6.out -I . slpush.myr ; ../6/6.out -I . slpush.myr
echo ../6/6.out -I . strfind.myr ; ../6/6.out -I . strfind.myr
echo ../6/6.out -I . strsplit.myr ; ../6/6.out -I . strsplit.myr
echo ../6/6.out -I . `$pwd/sysselect.sh wait`; ../6/6.out -I . `$pwd/sysselect.sh wait`
@@ -50,11 +41,20 @@
echo ../6/6.out -I . result.myr ; ../6/6.out -I . result.myr
echo ../6/6.out -I . slurp.myr ; ../6/6.out -I . slurp.myr
echo ../6/6.out -I . dirname.myr ; ../6/6.out -I . dirname.myr
+echo ../6/6.out -I . `$pwd/sysselect.sh errno`; ../6/6.out -I . `$pwd/sysselect.sh errno`
echo ../6/6.out -I . putint.myr ; ../6/6.out -I . putint.myr
echo ../6/6.out -I . mkpath.myr ; ../6/6.out -I . mkpath.myr
+echo ../6/6.out -I . introspect.myr ; ../6/6.out -I . introspect.myr
+echo ../6/6.out -I . bigint.myr ; ../6/6.out -I . bigint.myr
+echo ../6/6.out -I . cstrconv.myr ; ../6/6.out -I . cstrconv.myr
+echo ../6/6.out -I . fltbits.myr ; ../6/6.out -I . fltbits.myr
+echo ../6/6.out -I . strbuf.myr ; ../6/6.out -I . strbuf.myr
+echo ../6/6.out -I . fltfmt.myr ; ../6/6.out -I . fltfmt.myr
+echo ../6/6.out -I . `$pwd/sysselect.sh syswrap-ss`; ../6/6.out -I . `$pwd/sysselect.sh syswrap-ss`
+echo ../6/6.out -I . varargs.myr ; ../6/6.out -I . varargs.myr
+echo ../6/6.out -I . fmt.myr ; ../6/6.out -I . fmt.myr
echo ../6/6.out -I . `$pwd/sysselect.sh env`; ../6/6.out -I . `$pwd/sysselect.sh env`
echo ../6/6.out -I . `$pwd/sysselect.sh resolve`; ../6/6.out -I . `$pwd/sysselect.sh resolve`
-echo ../6/6.out -I . strbuf.myr ; ../6/6.out -I . strbuf.myr
echo ../6/6.out -I . pathjoin.myr ; ../6/6.out -I . pathjoin.myr
echo ../6/6.out -I . optparse.myr ; ../6/6.out -I . optparse.myr
echo ../6/6.out -I . ipparse.myr ; ../6/6.out -I . ipparse.myr
@@ -72,8 +72,8 @@
echo ../6/6.out -I . swap.myr ; ../6/6.out -I . swap.myr
echo ../6/6.out -I . bitset.myr ; ../6/6.out -I . bitset.myr
echo ../6/6.out -I . `$pwd/sysselect.sh dial`; ../6/6.out -I . `$pwd/sysselect.sh dial`
-echo ../muse/6.out -o std putint.use fmt.use try.use sort.use blat.use pathjoin.use strjoin.use mk.use errno.use hassuffix.use execvp.use swap.use types.use ipparse.use syswrap-ss.use strfind.use utf.use cstrconv.use search.use die.use units.use wait.use sljoin.use slpush.use result.use htab.use now.use strstrip.use bitset.use getcwd.use rand.use env.use slurp.use intparse.use varargs.use strbuf.use clear.use hasprefix.use slput.use mkpath.use getint.use strsplit.use syswrap.use resolve.use dirname.use sleq.use endian.use alloc.use optparse.use spork.use dial.use fltbits.use cmp.use sldup.use chartype.use fltfmt.use bigint.use extremum.use hashfuncs.use option.use slcp.use slfill.use ; ../muse/6.out -o std putint.use fmt.use try.use sort.use blat.use pathjoin.use strjoin.use mk.use errno.use hassuffix.use execvp.use swap.use types.use ipparse.use syswrap-ss.use strfind.use utf.use cstrconv.use search.use die.use units.use wait.use sljoin.use slpush.use result.use htab.use now.use strstrip.use bitset.use getcwd.use rand.use env.use slurp.use intparse.use varargs.use strbuf.use clear.use hasprefix.use slput.use mkpath.use getint.use strsplit.use syswrap.use resolve.use dirname.use sleq.use endian.use alloc.use optparse.use spork.use dial.use fltbits.use cmp.use sldup.use chartype.use fltfmt.use bigint.use extremum.use hashfuncs.use option.use slcp.use slfill.use introspect.use
-echo ar vu libstd.a putint.6 fmt.6 try.6 sort.6 blat.6 pathjoin.6 strjoin.6 mk.6 errno.6 hassuffix.6 execvp.6 swap.6 types.6 ipparse.6 syswrap-ss.6 strfind.6 utf.6 cstrconv.6 search.6 die.6 units.6 wait.6 sljoin.6 slpush.6 result.6 htab.6 now.6 strstrip.6 bitset.6 getcwd.6 rand.6 env.6 slurp.6 intparse.6 varargs.6 strbuf.6 clear.6 hasprefix.6 slput.6 mkpath.6 getint.6 strsplit.6 syswrap.6 resolve.6 dirname.6 sleq.6 endian.6 alloc.6 optparse.6 spork.6 dial.6 fltbits.6 cmp.6 sldup.6 chartype.6 fltfmt.6 bigint.6 extremum.6 hashfuncs.6 option.6 slcp.6 slfill.6 ; ar vu libstd.a putint.6 fmt.6 try.6 sort.6 blat.6 pathjoin.6 strjoin.6 mk.6 errno.6 hassuffix.6 execvp.6 swap.6 types.6 ipparse.6 syswrap-ss.6 strfind.6 utf.6 cstrconv.6 search.6 die.6 units.6 wait.6 sljoin.6 slpush.6 result.6 htab.6 now.6 strstrip.6 bitset.6 getcwd.6 rand.6 env.6 slurp.6 intparse.6 varargs.6 strbuf.6 clear.6 hasprefix.6 slput.6 mkpath.6 getint.6 strsplit.6 syswrap.6 resolve.6 dirname.6 sleq.6 endian.6 alloc.6 optparse.6 spork.6 dial.6 fltbits.6 cmp.6 sldup.6 chartype.6 fltfmt.6 bigint.6 extremum.6 hashfuncs.6 option.6 slcp.6 slfill.6 introspect.6
+echo ../muse/6.out -o std putint.use fmt.use try.use sort.use blat.use pathjoin.use strjoin.use mk.use errno.use hassuffix.use execvp.use swap.use types.use ipparse.use syswrap-ss.use strfind.use utf.use cstrconv.use search.use die.use units.use wait.use sljoin.use slpush.use result.use htab.use now.use strstrip.use bitset.use getcwd.use rand.use env.use slurp.use intparse.use varargs.use strbuf.use clear.use hasprefix.use slput.use mkpath.use getint.use strsplit.use introspect.use syswrap.use resolve.use dirname.use sleq.use endian.use alloc.use optparse.use spork.use dial.use fltbits.use cmp.use sldup.use chartype.use fltfmt.use bigint.use extremum.use hashfuncs.use option.use slcp.use slfill.use ; ../muse/6.out -o std putint.use fmt.use try.use sort.use blat.use pathjoin.use strjoin.use mk.use errno.use hassuffix.use execvp.use swap.use types.use ipparse.use syswrap-ss.use strfind.use utf.use cstrconv.use search.use die.use units.use wait.use sljoin.use slpush.use result.use htab.use now.use strstrip.use bitset.use getcwd.use rand.use env.use slurp.use intparse.use varargs.use strbuf.use clear.use hasprefix.use slput.use mkpath.use getint.use strsplit.use introspect.use syswrap.use resolve.use dirname.use sleq.use endian.use alloc.use optparse.use spork.use dial.use fltbits.use cmp.use sldup.use chartype.use fltfmt.use bigint.use extremum.use hashfuncs.use option.use slcp.use slfill.use
+echo ar vu libstd.a putint.6 fmt.6 try.6 sort.6 blat.6 pathjoin.6 strjoin.6 mk.6 errno.6 hassuffix.6 execvp.6 swap.6 types.6 ipparse.6 syswrap-ss.6 strfind.6 utf.6 cstrconv.6 search.6 die.6 units.6 wait.6 sljoin.6 slpush.6 result.6 htab.6 now.6 strstrip.6 bitset.6 getcwd.6 rand.6 env.6 slurp.6 intparse.6 varargs.6 strbuf.6 clear.6 hasprefix.6 slput.6 mkpath.6 getint.6 strsplit.6 introspect.6 syswrap.6 resolve.6 dirname.6 sleq.6 endian.6 alloc.6 optparse.6 spork.6 dial.6 fltbits.6 cmp.6 sldup.6 chartype.6 fltfmt.6 bigint.6 extremum.6 hashfuncs.6 option.6 slcp.6 slfill.6 ; ar vu libstd.a putint.6 fmt.6 try.6 sort.6 blat.6 pathjoin.6 strjoin.6 mk.6 errno.6 hassuffix.6 execvp.6 swap.6 types.6 ipparse.6 syswrap-ss.6 strfind.6 utf.6 cstrconv.6 search.6 die.6 units.6 wait.6 sljoin.6 slpush.6 result.6 htab.6 now.6 strstrip.6 bitset.6 getcwd.6 rand.6 env.6 slurp.6 intparse.6 varargs.6 strbuf.6 clear.6 hasprefix.6 slput.6 mkpath.6 getint.6 strsplit.6 introspect.6 syswrap.6 resolve.6 dirname.6 sleq.6 endian.6 alloc.6 optparse.6 spork.6 dial.6 fltbits.6 cmp.6 sldup.6 chartype.6 fltfmt.6 bigint.6 extremum.6 hashfuncs.6 option.6 slcp.6 slfill.6
echo cd $pwd; cd $pwd
echo cd $pwd/libbio; cd $pwd/libbio
echo ../6/6.out -I ../libstd bio.myr ; ../6/6.out -I ../libstd bio.myr
@@ -103,8 +103,8 @@
echo ../6/6.out -I ../libregex -I ../libbio -I ../libstd clean.myr ; ../6/6.out -I ../libregex -I ../libbio -I ../libstd clean.myr
echo ../6/6.out -I ../libregex -I ../libbio -I ../libstd test.myr ; ../6/6.out -I ../libregex -I ../libbio -I ../libstd test.myr
echo ../6/6.out -I ../libregex -I ../libbio -I ../libstd main.myr ; ../6/6.out -I ../libregex -I ../libbio -I ../libstd main.myr
-echo 6l -lo mbld ../rt/_myrrt.6 clean.6 types.6 deps.6 fsel.6 util.6 parse.6 main.6 build.6 opts.6 config.6 install.6 test.6 ../libregex/libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a ; 6l -lo mbld ../rt/_myrrt.6 clean.6 types.6 deps.6 fsel.6 util.6 parse.6 main.6 build.6 opts.6 config.6 install.6 test.6 ../libregex/libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a
+echo 6l -lo mbld /usr/glenda/mc2/mc/rt/_myrrt.6 clean.6 types.6 deps.6 fsel.6 util.6 parse.6 main.6 build.6 opts.6 config.6 install.6 test.6 ../libregex/libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a ; 6l -lo mbld /usr/glenda/mc2/mc/rt/_myrrt.6 clean.6 types.6 deps.6 fsel.6 util.6 parse.6 main.6 build.6 opts.6 config.6 install.6 test.6 ../libregex/libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a
echo cd $pwd; cd $pwd
echo cd $pwd/libregex; cd $pwd/libregex
echo ../6/6.out -I . -I ../libbio -I ../libstd redump.myr ; ../6/6.out -I . -I ../libbio -I ../libstd redump.myr
-echo 6l -lo redump ../rt/_myrrt.6 redump.6 libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a ; 6l -lo redump ../rt/_myrrt.6 redump.6 libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a
+echo 6l -lo redump /usr/glenda/mc2/mc/rt/_myrrt.6 redump.6 libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a ; 6l -lo redump /usr/glenda/mc2/mc/rt/_myrrt.6 redump.6 libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a