[Commit] nickle ChangeLog, 1.48, 1.49 Makefile.am, 1.52, 1.53 make-version.sh, 1.1, 1.2 version.m4, 1.13, NONE

[Bart Massey]

Committed by: bart

Update of /local/src/CVS/nickle
In directory home.keithp.com:/tmp/cvs-serv16905

Modified Files:
	ChangeLog Makefile.am make-version.sh 
Removed Files:
	version.m4 
Log Message:
Make version.h from ChangeLog now.  Will require ChangeLog
version number maintenance, but hopefully will mean it gets
bumped now.



Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/nickle/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- a/ChangeLog	21 May 2004 06:10:34 -0000	1.48
+++ b/ChangeLog	23 May 2004 06:01:51 -0000	1.49
@@ -1,3 +1,13 @@
+2004-05-21 Bart Massey <bart at cs.pdx.edu>
+version 2.34
+	
+	* version.m4, Makefile.am, make-version.sh
+
+	The version number is going stale again.  Start putting it in the
+	ChangeLog, and have the Makefile grub it out of there.  Get rid of
+	version.m4 After all, the ChangeLog has to be good for something
+	:-).
+
 2004-05-20  Keith Packard  <keithp at keithp.com>
 
 	* compile.c: (CompileLvalue), (_CompileExpr):

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/nickle/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- a/Makefile.am	18 May 2004 06:26:03 -0000	1.52
+++ b/Makefile.am	23 May 2004 06:01:51 -0000	1.53
@@ -20,7 +20,7 @@
 	 debian/control debian/copyright debian/rules
 	 
 EXTRA_DIST = README.name autogen.sh update-version.sh make-version.sh \
-	$(NICKLEFILES) gram.h $(EXAMPLES) $(TEST) $(DEBIAN) version.m4 \
+	$(NICKLEFILES) gram.h $(EXAMPLES) $(TEST) $(DEBIAN) ChangeLog \
 	nickle.spec.in
 
 bin_PROGRAMS = nickle
@@ -67,8 +67,8 @@
 
 builtin.o: version.h
 
-version.h: $(top_srcdir)/make-version.sh $(top_srcdir)/version.m4
-	sh $(top_srcdir)/make-version.sh $(top_srcdir)/version.m4
+version.h: $(top_srcdir)/make-version.sh $(top_srcdir)/ChangeLog
+	sh $(top_srcdir)/make-version.sh $(top_srcdir)/ChangeLog
 
 debuild debuild-signed: debuild-dirs
 	(cd $(distdir)/debian && debuild)

Index: make-version.sh
===================================================================
RCS file: /local/src/CVS/nickle/make-version.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/make-version.sh	27 Feb 2004 03:19:59 -0000	1.1
+++ b/make-version.sh	23 May 2004 06:01:51 -0000	1.2
@@ -1,8 +1,6 @@
 #!/bin/sh
 FILE=$1
-CURHEADER="`sed -e '/CURHEADER/!d' -e 's=^.*\$\(.*\)\$$=\1=' <$FILE`"
-OLDHEADER="`sed -e '/OLDHEADER/!d' -e 's=^.*<\(.*\)>$=\1=' <$FILE`"
-CURVERSION="`sed -e '/CURVERSION/!d' -e 's=^[^0-9]*\(.*\)$=\1=' <$FILE`"
+VERSION="`sed -e '/^version [0-9.][0-9.]*$/!d' \"$FILE\" | sed -e '1!d' -e 's/^.* //'`"
 
-( echo '/* This file is maintained automatically by update-version.sh */'
-  echo "#define BUILD_VERSION \"$CURVERSION\"" ) > version.h
+( echo "/* This file is created automatically using $FILE by make-version.sh */"
+  echo "#define BUILD_VERSION \"$VERSION\"" ) > version.h

--- version.m4 DELETED ---