Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 May 2013 21:08:51 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r250680 - projects/flex-sf/usr.bin/lex
Message-ID:  <201305152108.r4FL8p6B004668@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Wed May 15 21:08:51 2013
New Revision: 250680
URL: http://svnweb.freebsd.org/changeset/base/250680

Log:
  Build version numbers from config.h.

Added:
  projects/flex-sf/usr.bin/lex/version.awk   (contents, props changed)
Modified:
  projects/flex-sf/usr.bin/lex/Makefile

Modified: projects/flex-sf/usr.bin/lex/Makefile
==============================================================================
--- projects/flex-sf/usr.bin/lex/Makefile	Wed May 15 21:05:25 2013	(r250679)
+++ projects/flex-sf/usr.bin/lex/Makefile	Wed May 15 21:08:51 2013	(r250680)
@@ -37,17 +37,12 @@ GENFILES=	parse.c parse.h scan.c skel.c
 
 SUBDIR=		lib
 
-MAJOR_VERSION=		2
-MINOR_VERSION=		5
-SUBMINOR_VERSION=	37
+FLEX_VERSION=	`awk -f ${.CURDIR}/version.awk ${.CURDIR}/config.h`
 
-skel.c: mkskel.sh flex.skl
+skel.c: config.h mkskel.sh flex.skl version.awk
 	sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' \
 	    ${FLEXDIR}/flex.skl | \
-	m4 -I${FLEXDIR} -P \
-	    -DFLEX_MAJOR_VERSION=${MAJOR_VERSION} \
-	    -DFLEX_MINOR_VERSION=${MINOR_VERSION} \
-	    -DFLEX_SUBMINOR_VERSION=${SUBMINOR_VERSION} | \
+	m4 -I${FLEXDIR} -P ${FLEX_VERSION} | \
 	sed 's/m4postproc_/m4_/g' | \
 	sh ${FLEXDIR}/mkskel.sh > ${.TARGET}
 

Added: projects/flex-sf/usr.bin/lex/version.awk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/flex-sf/usr.bin/lex/version.awk	Wed May 15 21:08:51 2013	(r250680)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+BEGIN {
+	FS = "[ \t\.\"]+"
+}
+
+{
+	if ($1 ~ /^#define$/ && $2 ~ /^VERSION$/) {
+		printf("-DFLEX_MAJOR_VERSION=%s\n", $3);
+		printf("-DFLEX_MINOR_VERSION=%s\n", $4);
+		printf("-DFLEX_SUBMINOR_VERSION=%s\n", $5);
+	}
+}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305152108.r4FL8p6B004668>