- install gofmt in src/cmd/gofmt

- remove some left-over files

R=rsc
DELTA=1465  (281 added, 1181 deleted, 3 changed)
OCL=30350
CL=30353

src/cmd/gofmt/Makefile

+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+include $(GOROOT)/src/Make.$(GOARCH)
+
+TARG=gofmt
+OFILES=\
+	gofmt.$O\
+
+$(TARG): $(OFILES)
+	$(LD) -o $(TARG) $(OFILES)
+
+test: $(TARG)
+	./test.sh
+
+smoketest: $(TARG)
+	./test.sh $(GOROOT)/src/pkg/go/parser/parser.go
+
+clean:
+	rm -f $(OFILES) $(TARG)
+
+install: $(TARG)
+	cp $(TARG) $(HOME)/bin/$(TARG)
+
+%.$O:	%.go
+	$(GC) $<

usr/gri/pretty/test.sh → src/cmd/gofmt/test.sh

-# Copyright 2009 The Go Authors.  All rights reserved.
+#!/bin/bash
+# Copyright 2009 The Go Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-#!/bin/bash
-
 . $GOROOT/src/Make.$GOARCH
 if [ -z "$O" ]; then
 	echo 'missing $O - maybe no Make.$GOARCH?' 1>&2

src/make.bash

@@ -18,7 +18,7 @@ rm -f $HOME/bin/quietgcc
 cp quietgcc.bash $HOME/bin/quietgcc
 chmod +x $HOME/bin/quietgcc
 
-for i in lib9 libbio libmach_amd64 libregexp cmd pkg cmd/gobuild cmd/godoc
+for i in lib9 libbio libmach_amd64 libregexp cmd pkg cmd/gobuild cmd/godoc cmd/gofmt
 do (
 	echo; echo; echo %%%% making $i %%%%; echo
 	cd $i

src/run.bash

@@ -36,12 +36,10 @@ time make
 GOMAXPROCS=10 make test
 ) || exit $?
 
-(xcd ../usr/gri/pretty
+(xcd cmd/gofmt
 make clean
 time make
-make smoketest
-# TODO: this belongs elsewhere
-cp godoc $HOME/bin
+time make smoketest
 ) || exit $?
 
 (xcd ../doc/progs

usr/gri/pretty/package.html

-{.section Dirs}
-	<h2>Subdirectories</h2>
-	{.repeated section @}
-		<a href="{Name|html}/">{Name|html}</a><br />
-	{.end}
-	<hr />
-{.end}
-{.section PDoc}
-	<h1>package {PackageName|html}</h1>
-	<p><code>import "{ImportPath|html}"</code></p>
-
-	{Doc|html-comment}
-	{.section Consts}
-		<h2>Constants</h2>
-		{.repeated section @}
-			{Doc|html-comment}
-			<pre>{Decl|html}</pre>
-		{.end}
-	{.end}
-	{.section Vars}
-		<hr />
-		<h2>Variables</h2>
-		{.repeated section @}
-			{Doc|html-comment}
-			<pre>{Decl|html}</pre>
-		{.end}
-	{.end}
-	{.section Funcs}
-		<hr />
-		{.repeated section @}
-			<h2>func {Name|html}</h2>
-			<p><code>{Decl|html}</code></p>
-			{Doc|html-comment}
-		{.end}
-	{.end}
-	{.section Types}
-		{.repeated section @}
-			<hr />
-			<h2>type {.section Type}{Name|html}{.end}</h2>
-			{Doc|html-comment}
-			<p><pre>{Decl|html}</pre></p>
-			{.repeated section Factories}
-				<h3>func {Name|html}</h3>
-				<p><code>{Decl|html}</code></p>
-				{Doc|html-comment}
-			{.end}
-			{.repeated section Methods}
-				<h3>func ({Recv|html}) {Name|html}</h3>
-				<p><code>{Decl|html}</code></p>
-				{Doc|html-comment}
-			{.end}
-		{.end}
-	{.end}
-{.end}

usr/gri/pretty/package.txt

-{.section Dirs}
-SUBDIRECTORIES
-{.repeated section @}
-	{Name}
-{.end}
-
-{.end}
-{.section PDoc}
-PACKAGE
-
-package {PackageName}
-import "{ImportPath}"
-{.section Doc}
-
-{@}
-{.end}
-{.section Consts}
-
-CONSTANTS
-{.repeated section @}
-{# the .repeated section, .section idiom skips over nils in the array}
-
-{Decl}
-
-{Doc}
-{.end}
-{.end}
-{.section Vars}
-
-VARIABLES
-{.repeated section @}
-
-{Decl}
-
-{Doc}
-{.end}
-{.end}
-{.section Funcs}
-
-FUNCTIONS
-{.repeated section @}
-
-{Decl}
-
-{Doc}
-{.end}
-{.end}
-{.section Types}
-
-TYPES
-{.repeated section @}
-
-{Decl}
-
-{Doc}
-{.repeated section Factories}
-
-{Decl}
-
-{Doc}
-{.end}
-{.repeated section Methods}
-
-{Decl}
-
-{Doc}
-{.end}
-{.end}
-{.end}
-{.end}

usr/gri/pretty/parseerror.html

-<h1>Parse errors in {filename}</h1>
-<pre>
-{.repeated section list}
-{src}{.section msg}<b><font color=red>«{msg|html}»</font></b>{.end}{.end}</pre>

usr/gri/pretty/parseerror.txt

-parse errors:
-{.repeated section list}
-{.section msg}
-{filename}:{line}: {msg}
-{.end}
-{.end}