Move usr/dsymonds/iterable to src/pkg/exp/iterable.

Remove remainder of usr/dsymonds.

R=rsc,r
APPROVED=r
DELTA=685  (275 added, 409 deleted, 1 changed)
OCL=35810
CL=35933

diff --git a/src/clean.bash b/src/clean.bash
index 2bfc88f22cbfda675926551413131e6e7f93d6aa..31cbdab86d3092da323e3a46ca76d725d437a0ce 100755 (executable)
--- a/src/clean.bash
+++ b/src/clean.bash
@@ -7,7 +7,7 @@ rm -rf $GOROOT/pkg/${GOOS}_$GOARCH
 rm -f $GOROOT/lib/*.a
 for i in lib9 libbio libcgo libmach libregexp cmd pkg \
        ../misc/cgo/gmp ../misc/cgo/stdio \
-       ../usr/r/rpc ../usr/dsymonds/iterable \
+       ../usr/r/rpc \
        ../test/bench
 do(
        cd $i || exit 1

diff --git a/src/pkg/Make.deps b/src/pkg/Make.deps
index 49862d2dc6bd6f355ecfbdaddb3ef21da08b919b..9cd6ff34bff47e3ba44ae514a14c8158a4fb5b1d 100644 (file)
--- a/src/pkg/Make.deps
+++ b/src/pkg/Make.deps
@@ -30,6 +30,7 @@ encoding/git85.install: bytes.install io.install os.install strconv.install
 exec.install: os.install strings.install
 exp/datafmt.install: bytes.install container/vector.install fmt.install go/scanner.install go/token.install io.install os.install reflect.install runtime.install strconv.install strings.install
 exp/eval.install: bignum.install fmt.install go/ast.install go/parser.install go/scanner.install go/token.install log.install os.install reflect.install runtime.install strconv.install strings.install
+exp/iterable.install: container/vector.install
 expvar.install: bytes.install fmt.install http.install log.install strconv.install sync.install
 flag.install: fmt.install os.install strconv.install
 fmt.install: io.install os.install reflect.install strconv.install utf8.install

diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index cd50bb92fbf417e75e3c2f6e4f80d2fc05a26e90..9da15b83a8c4e5f56348791af3c6d62a193e7b7a 100644 (file)
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -44,6 +44,7 @@ DIRS=\
        exec\
        exp/datafmt\
        exp/eval\
+       exp/iterable\
        expvar\
        flag\
        fmt\

diff --git a/usr/dsymonds/iterable/Makefile b/src/pkg/exp/iterable/Makefile
similarity index 93%
rename from usr/dsymonds/iterable/Makefile
rename to src/pkg/exp/iterable/Makefile
index 3485d0ee43acc9ef1a877891c2fc1df18ede9420..18e9e8170712c1dadbf9f5f3e4de04a97c633bb1 100644 (file)
--- a/usr/dsymonds/iterable/Makefile
+++ b/src/pkg/exp/iterable/Makefile
@@ -4,7 +4,7 @@
 
 include $(GOROOT)/src/Make.$(GOARCH)
 
-TARG=iterable
+TARG=exp/iterable
 GOFILES=\
        iterable.go\
 

diff --git a/usr/dsymonds/iterable/iterable.go b/src/pkg/exp/iterable/iterable.go
similarity index 100%
rename from usr/dsymonds/iterable/iterable.go
rename to src/pkg/exp/iterable/iterable.go

diff --git a/usr/dsymonds/iterable/iterable_test.go b/src/pkg/exp/iterable/iterable_test.go
similarity index 100%
rename from usr/dsymonds/iterable/iterable_test.go
rename to src/pkg/exp/iterable/iterable_test.go

diff --git a/src/run.bash b/src/run.bash
index 619ba9b7d856e566abec83b387f0e889367f2ec0..d88ea7852b197f77566fbd68fe57e00f52ac79cc 100755 (executable)
--- a/src/run.bash
+++ b/src/run.bash
@@ -59,11 +59,6 @@ time make
 ./chanrun
 ) || exit $?
 
-(xcd ../usr/dsymonds/iterable
-make clean
-time make test
-) || exit $?
-
 (xcd pkg/exp/ogle
 make clean
 time make ogle