diff options
| author | David Symonds <dsymonds@golang.org> | 2009-10-20 14:10:22 -0700 |
|---|---|---|
| committer | David Symonds <dsymonds@golang.org> | 2009-10-20 14:10:22 -0700 |
| commit | bbbada7b269987c36526d5d29d1182b4b7c0d1d3 (patch) | |
| tree | fdbfb5fe33fdc437fc9e930ac7202fff35760152 | |
| parent | 6d708b667f866254dfb27c85b009f0ff42b8b0cf (diff) | |
| download | golang-bbbada7b269987c36526d5d29d1182b4b7c0d1d3.tar.gz | |
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
| -rwxr-xr-x | src/clean.bash | 2 | ||||
| -rw-r--r-- | src/pkg/Make.deps | 1 | ||||
| -rw-r--r-- | src/pkg/Makefile | 1 | ||||
| -rw-r--r-- | src/pkg/exp/iterable/Makefile (renamed from usr/dsymonds/iterable/Makefile) | 2 | ||||
| -rw-r--r-- | src/pkg/exp/iterable/iterable.go (renamed from usr/dsymonds/iterable/iterable.go) | 0 | ||||
| -rw-r--r-- | src/pkg/exp/iterable/iterable_test.go (renamed from usr/dsymonds/iterable/iterable_test.go) | 0 | ||||
| -rwxr-xr-x | src/run.bash | 5 |
7 files changed, 4 insertions, 7 deletions
diff --git a/src/clean.bash b/src/clean.bash index 2bfc88f22..31cbdab86 100755 --- 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 49862d2dc..9cd6ff34b 100644 --- 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 cd50bb92f..9da15b83a 100644 --- 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 index 3485d0ee4..18e9e8170 100644 --- 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 index bdcce11d0..bdcce11d0 100644 --- a/usr/dsymonds/iterable/iterable.go +++ b/src/pkg/exp/iterable/iterable.go diff --git a/usr/dsymonds/iterable/iterable_test.go b/src/pkg/exp/iterable/iterable_test.go index 28bdfb66f..28bdfb66f 100644 --- a/usr/dsymonds/iterable/iterable_test.go +++ b/src/pkg/exp/iterable/iterable_test.go diff --git a/src/run.bash b/src/run.bash index 619ba9b7d..d88ea7852 100755 --- 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 |