ref: 4c676e772d94515b4e13248d82da7597c6cecc9e
parent: d7d976b9e1b50fc1fd761e560fe3990f2399db4f
author: Ori Bernstein <ori@eigenstate.org>
date: Wed Apr 15 06:32:23 EDT 2015
Rename bldfiles.
We now consume bld.proj/bld.sub over bldfile.
--- /dev/null
+++ b/bld.proj
@@ -1,0 +1,7 @@
+sub =
+ libstd
+ libbio
+ libregex
+ mbld
+;;
+
--- a/bldfile
+++ /dev/null
@@ -1,7 +1,0 @@
-sub =
- libstd
- libbio
- libregex
- mbld
-;;
-
--- /dev/null
+++ b/libbio/bld.sub
@@ -1,0 +1,7 @@
+lib bio =
+ bio.myr
+ geti.myr
+ puti.myr
+
+ lib ../libstd:std
+;;
--- a/libbio/bldfile
+++ /dev/null
@@ -1,7 +1,0 @@
-lib bio =
- bio.myr
- geti.myr
- puti.myr
-
- lib ../libstd:std
-;;
--- /dev/null
+++ b/libregex/bld.sub
@@ -1,0 +1,12 @@
+lib regex =
+ compile.myr
+ interp.myr
+ ranges.myr
+ types.myr
+
+ lib ../libstd:std
+;;
+
+gen ranges.myr {durable} =+ mkchartab -a -p_ranges UnicodeData.txt -o ranges.myr
+;;
--- a/libregex/bldfile
+++ /dev/null
@@ -1,12 +1,0 @@
-lib regex =
- compile.myr
- interp.myr
- ranges.myr
- types.myr
-
- lib ../libstd:std
-;;
-
-gen ranges.myr {durable} =- mkchartab -a -p_ranges UnicodeData.txt -o ranges.myr
-;;
--- /dev/null
+++ b/libstd/bld.sub
@@ -1,0 +1,96 @@
+lib sys =
+ sys+freebsd-x64.myr
+ sys+linux-x64.myr
+ sys+osx-x64.myr
+ syscall+freebsd-x64.s
+ syscall+linux-x64.s
+ syscall+osx-x64.s
+ syserrno+linux.myr
+ syserrno+osx.myr
+ systypes.myr
+ ifreq+freebsd.myr
+ ifreq+linux.myr
+ ifreq+osx.myr
+ ifreq+plan9.myr # dummy file: plan9 doesn't have ifreq
+ util+plan9-x64.s
+ util+posixy-x64.s
+;;
+
+lib std {inc=.} =+ lib sys
+
+ # portable files
+ alloc.myr
+ bigint.myr
+ bitset.myr
+ blat.myr
+ bytebuf.myr
+ chartype.myr
+ clear.myr
+ cmp.myr
+ cstrconv.myr
+ dial+posixy.myr
+ dial+plan9.myr
+ die.myr
+ dirname.myr
+ endian.myr
+ env+posixy.myr
+ env+plan9.myr
+ errno.myr
+ execvp.myr
+ extremum.myr
+ fltbits.myr
+ fltfmt.myr
+ fmt.myr
+ getcwd.myr
+ hashfuncs.myr
+ hasprefix.myr
+ hassuffix.myr
+ htab.myr
+ getint.myr
+ intparse.myr
+ ipparse.myr
+ mk.myr
+ mkpath.myr
+ now.myr
+ option.myr
+ optparse.myr
+ pathjoin.myr
+ putint.myr
+ rand.myr
+ resolve+posixy.myr
+ resolve+plan9.myr
+ result.myr
+ search.myr
+ slcp.myr
+ sldup.myr
+ sleq.myr
+ slfill.myr
+ sljoin.myr
+ slpush.myr
+ slput.myr
+ slurp.myr
+ sort.myr
+ spork.myr
+ strfind.myr
+ strjoin.myr
+ strsplit.myr
+ strstrip.myr
+ syswrap+plan9.myr
+ syswrap-ss+posixy-linux.myr
+ syswrap-ss+posixy-osx.myr
+ syswrap+posixy.myr
+ swap.myr
+ try.myr
+ types.myr
+ units.myr
+ utf.myr
+ varargs.myr
+
+ # platform specific files
+ dir+freebsd.myr
+ dir+linux.myr
+ dir+osx.myr
+ wait+posixy.myr
+ wait+plan9.myr
+;;
--- a/libstd/bldfile
+++ /dev/null
@@ -1,96 +1,0 @@
-lib sys =
- sys+freebsd-x64.myr
- sys+linux-x64.myr
- sys+osx-x64.myr
- syscall+freebsd-x64.s
- syscall+linux-x64.s
- syscall+osx-x64.s
- syserrno+linux.myr
- syserrno+osx.myr
- systypes.myr
- ifreq+freebsd.myr
- ifreq+linux.myr
- ifreq+osx.myr
- ifreq+plan9.myr # dummy file: plan9 doesn't have ifreq
- util+plan9-x64.s
- util+posixy-x64.s
-;;
-
-lib std {inc=.} =- lib sys
-
- # portable files
- alloc.myr
- bigint.myr
- bitset.myr
- blat.myr
- bytebuf.myr
- chartype.myr
- clear.myr
- cmp.myr
- cstrconv.myr
- dial+posixy.myr
- dial+plan9.myr
- die.myr
- dirname.myr
- endian.myr
- env+posixy.myr
- env+plan9.myr
- errno.myr
- execvp.myr
- extremum.myr
- fltbits.myr
- fltfmt.myr
- fmt.myr
- getcwd.myr
- hashfuncs.myr
- hasprefix.myr
- hassuffix.myr
- htab.myr
- getint.myr
- intparse.myr
- ipparse.myr
- mk.myr
- mkpath.myr
- now.myr
- option.myr
- optparse.myr
- pathjoin.myr
- putint.myr
- rand.myr
- resolve+posixy.myr
- resolve+plan9.myr
- result.myr
- search.myr
- slcp.myr
- sldup.myr
- sleq.myr
- slfill.myr
- sljoin.myr
- slpush.myr
- slput.myr
- slurp.myr
- sort.myr
- spork.myr
- strfind.myr
- strjoin.myr
- strsplit.myr
- strstrip.myr
- syswrap+plan9.myr
- syswrap-ss+posixy-linux.myr
- syswrap-ss+posixy-osx.myr
- syswrap+posixy.myr
- swap.myr
- try.myr
- types.myr
- units.myr
- utf.myr
- varargs.myr
-
- # platform specific files
- dir+freebsd.myr
- dir+linux.myr
- dir+osx.myr
- wait+posixy.myr
- wait+plan9.myr
-;;
--- /dev/null
+++ b/mbld/bld.sub
@@ -1,0 +1,32 @@
+# the mbld binary
+bin mbld =
+ build.myr
+ clean.myr
+ config.myr # config, as generated by the ./configure script
+ config+plan9-x64.myr # config, as hardcoded for Plan 9
+ deps.myr
+ fsel.myr
+ install.myr
+ main.myr
+ opts.myr
+ parse.myr
+ subdir.myr
+ test.myr
+ types.myr
+ util.myr
+
+ # Currently, mbld doesn't add all deps transitively.
+ # Until this gets fixed, we need to list all dependent
+ # libraries here explicitly.
+ lib @/libstd:sys
+ lib @/libstd:std
+ lib @/libbio:bio
+ lib @/libregex:regex
+;;
+
+gen config.myr {durable} =+ sh -c "cd .. && ./configure --redo"
+;;
+
+man = mbld.1;;
+
--- a/mbld/bldfile
+++ /dev/null
@@ -1,32 +1,0 @@
-# the mbld binary
-bin mbld =
- build.myr
- clean.myr
- config.myr # config, as generated by the ./configure script
- config+plan9-x64.myr # config, as hardcoded for Plan 9
- deps.myr
- fsel.myr
- install.myr
- main.myr
- opts.myr
- parse.myr
- subdir.myr
- test.myr
- types.myr
- util.myr
-
- # Currently, mbld doesn't add all deps transitively.
- # Until this gets fixed, we need to list all dependent
- # libraries here explicitly.
- lib @/libstd:sys
- lib @/libstd:std
- lib @/libbio:bio
- lib @/libregex:regex
-;;
-
-gen config.myr {durable} =- sh -c "cd .. && ./configure --redo"
-;;
-
-man = mbld.1;;
-