gotype: move to exp/gotype per Go 1 plan

R=r, dsymonds
CC=golang-dev
https://golang.org/cl/5269043

diff --git a/src/cmd/Makefile b/src/cmd/Makefile
index d9da50a66b2546fab6537b8ab58f1a72ef6ea2fb..42088fdf110fe5120e976688281018cd9b1cee00 100644 (file)
--- a/src/cmd/Makefile
+++ b/src/cmd/Makefile
@@ -43,7 +43,6 @@ CLEANDIRS=\
        gofmt\
        goinstall\
        gotest\
-       gotype\
        goyacc\
        hgpatch\
 

diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index d823d2f3beb15f4f82bef7a7d8a3616afb71bab6..7fce462c36fe72e408e1cc3f0c4e6878ed150af0 100644 (file)
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -78,6 +78,7 @@ DIRS=\
        exec\
        exp/ebnf\
        exp/ebnflint\
+       exp/gotype\
        exp/gui\
        exp/gui/x11\
        exp/norm\
@@ -177,7 +178,6 @@ DIRS=\
        ../cmd/gofmt\
        ../cmd/goinstall\
        ../cmd/gotest\
-       ../cmd/gotype\
        ../cmd/govet\
        ../cmd/goyacc\
        ../cmd/hgpatch\

diff --git a/src/cmd/gotype/Makefile b/src/pkg/exp/gotype/Makefile
similarity index 82%
rename from src/cmd/gotype/Makefile
rename to src/pkg/exp/gotype/Makefile
index 18171945dfe9658dde878e6a0c6710d4209d3113..230242c582740d9c6c357c31efec3a690dab4b31 100644 (file)
--- a/src/cmd/gotype/Makefile
+++ b/src/pkg/exp/gotype/Makefile
@@ -2,13 +2,13 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=gotype
 GOFILES=\
        gotype.go\
 
-include ../../Make.cmd
+include ../../../Make.cmd
 
 test:
        gotest

diff --git a/src/cmd/gotype/doc.go b/src/pkg/exp/gotype/doc.go
similarity index 100%
rename from src/cmd/gotype/doc.go
rename to src/pkg/exp/gotype/doc.go

diff --git a/src/cmd/gotype/gotype.go b/src/pkg/exp/gotype/gotype.go
similarity index 100%
rename from src/cmd/gotype/gotype.go
rename to src/pkg/exp/gotype/gotype.go

diff --git a/src/cmd/gotype/gotype_test.go b/src/pkg/exp/gotype/gotype_test.go
similarity index 100%
rename from src/cmd/gotype/gotype_test.go
rename to src/pkg/exp/gotype/gotype_test.go

diff --git a/src/cmd/gotype/testdata/test1.go b/src/pkg/exp/gotype/testdata/test1.go
similarity index 100%
rename from src/cmd/gotype/testdata/test1.go
rename to src/pkg/exp/gotype/testdata/test1.go