From: Russ Cox <rsc@golang.org>
Date: Mon, 27 Jun 2011 16:03:19 +0000 (-0400)
Subject: 5l, 6l, 8l: drop use of ed during build
X-Git-Tag: weekly.2011-07-07~123
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9dd354c63f2a7b46c399d45b1d4c0bdbbe8d7518;p=gostls13.git

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 2256123ecb..f2736df57d 100644
--- 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 265cb99888..6cccb02638 100644
--- 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 5cabb26333..3001dbe934 100644
--- 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 b33fec7cc4..992aa31607 100644
--- 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 19402f3060..1db0daa22b 100644
--- a/src/env.bash
+++ b/src/env.bash
@@ -55,7 +55,6 @@ PROGS="
 	cp
 	cut
 	echo
-	ed
 	egrep
 	gcc
 	grep