5l, 6l, 8l: drop use of ed during build

build runs with chmod 0 /bin/ed now

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/4635071

diff --git a/doc/install.html b/doc/install.html
index 2256123ecb8daf30fbb5e48b1de53f41fad4af89..f2736df57da856c0fc01de9d9797a86d4a01a42c 100644 (file)
--- a/doc/install.html
+++ b/doc/install.html
@@ -81,8 +81,8 @@ To build it, you need these programs installed:
 <li>the standard C libraries, 
 <li>the parser generator Bison,
 <li>GNU <tt>make</tt> (version 3.81 or later),
-<li><tt>awk</tt>, and 
-<li>the text editor <tt>ed</tt>.
+and
+<li><tt>awk</tt>.
 </ul>
 </p>
 

diff --git a/src/cmd/5l/mkenam b/src/cmd/5l/mkenam
index 265cb998880726c06da07d5d1624113741b3b83e..6cccb02638ee1284153326e80fbeb6ab093a33d4 100644 (file)
--- a/src/cmd/5l/mkenam
+++ b/src/cmd/5l/mkenam
@@ -28,18 +28,18 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-ed - ../5l/5.out.h <<'!'
-v/^    A/d
-,s/^   A/      "/
-g/ .*$/s///
-,s/,*$/",/
-1i
-char*  anames[] =
-{
-.
-$a
-};
-.
-w enam.c
-Q
-!
+awk '
+BEGIN {
+       print "char*    anames[] ="
+       print "{"
+}
+
+/^     A/ {
+       name=$1
+       sub(/,/, "", name)
+       sub(/^A/, "", name)
+       print "\t\"" name "\","
+}
+
+END { print "};" }
+' ../5l/5.out.h >enam.c

diff --git a/src/cmd/6l/mkenam b/src/cmd/6l/mkenam
index 5cabb263337bb04863827ec884af4d216b2916bb..3001dbe9346249864dbe22af72a9fbe3a048a9d3 100644 (file)
--- a/src/cmd/6l/mkenam
+++ b/src/cmd/6l/mkenam
@@ -28,18 +28,18 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-/bin/ed - ../6l/6.out.h <<'!'
-v/^    A/d
-,s/^   A/      "/
-g/ .*$/s///
-,s/,*$/",/
-1i
-char*  anames[] =
-{
-.
-$a
-};
-.
-w enam.c
-Q
-!
+awk '
+BEGIN {
+       print "char*    anames[] ="
+       print "{"
+}
+
+/^     A/ {
+       name=$1
+       sub(/,/, "", name)
+       sub(/^A/, "", name)
+       print "\t\"" name "\","
+}
+
+END { print "};" }
+' ../6l/6.out.h >enam.c

diff --git a/src/cmd/8l/mkenam b/src/cmd/8l/mkenam
index b33fec7cc40234d00a41bd72222dbdef83dedd49..992aa316073d639a5b4cd2c89e4a942874d78220 100644 (file)
--- a/src/cmd/8l/mkenam
+++ b/src/cmd/8l/mkenam
@@ -28,18 +28,18 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-ed - ../8l/8.out.h <<'!'
-v/^    A/d
-,s/^   A/      "/
-g/ .*$/s///
-,s/,*$/",/
-1i
-char*  anames[] =
-{
-.
-$a
-};
-.
-w enam.c
-Q
-!
+awk '
+BEGIN {
+       print "char*    anames[] ="
+       print "{"
+}
+
+/^     A/ {
+       name=$1
+       sub(/,/, "", name)
+       sub(/^A/, "", name)
+       print "\t\"" name "\","
+}
+
+END { print "};" }
+' ../8l/8.out.h >enam.c

diff --git a/src/env.bash b/src/env.bash
index 19402f306086b3ba0dec932f5a3e8bf47a0e1b93..1db0daa22b1a56bf887fd3ad953232a5fb182db5 100644 (file)
--- a/src/env.bash
+++ b/src/env.bash
@@ -55,7 +55,6 @@ PROGS="
        cp
        cut
        echo
-       ed
        egrep
        gcc
        grep