Date: Tue, 14 Jul 2009 03:22:06 +0000 (UTC) From: John Birrell <jb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r195673 - in projects/jbuild/usr.bin: jbuild jbuild/port make Message-ID: <200907140322.n6E3M6r6043626@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jb Date: Tue Jul 14 03:22:06 2009 New Revision: 195673 URL: http://svn.freebsd.org/changeset/base/195673 Log: Add a JBUILD_VERSION variable to jbuild Added: projects/jbuild/usr.bin/jbuild/jbuild_version Modified: projects/jbuild/usr.bin/jbuild/Buildfile projects/jbuild/usr.bin/jbuild/Makefile projects/jbuild/usr.bin/jbuild/port/Makefile projects/jbuild/usr.bin/make/main.c Modified: projects/jbuild/usr.bin/jbuild/Buildfile ============================================================================== --- projects/jbuild/usr.bin/jbuild/Buildfile Tue Jul 14 02:50:29 2009 (r195672) +++ projects/jbuild/usr.bin/jbuild/Buildfile Tue Jul 14 03:22:06 2009 (r195673) @@ -40,5 +40,6 @@ CFLAGS += -I${.CURDIR}/filemon CFLAGS += -DMAKE_IS_BUILD -DJBUILD .include "${BSDSRCTOP}/usr.bin/jdirdep/Buildfile.common" +.include "${.CURDIR}/jbuild_version" .include <bsd.prog.mk> Modified: projects/jbuild/usr.bin/jbuild/Makefile ============================================================================== --- projects/jbuild/usr.bin/jbuild/Makefile Tue Jul 14 02:50:29 2009 (r195672) +++ projects/jbuild/usr.bin/jbuild/Makefile Tue Jul 14 03:22:06 2009 (r195673) @@ -30,6 +30,7 @@ CFLAGS += -I${.CURDIR}/filemon .endif .include "${.CURDIR}/../jdirdep/Makefile.common" +.include "${.CURDIR}/jbuild_version" # Make object files which depend on preprocessor symbols defined in # the Makefile which are not compilation options but rather configuration Added: projects/jbuild/usr.bin/jbuild/jbuild_version ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/jbuild/usr.bin/jbuild/jbuild_version Tue Jul 14 03:22:06 2009 (r195673) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +JBUILD_VERSION = 14 + +CFLAGS += -DJBUILD_VERSION=\"${JBUILD_VERSION}\" Modified: projects/jbuild/usr.bin/jbuild/port/Makefile ============================================================================== --- projects/jbuild/usr.bin/jbuild/port/Makefile Tue Jul 14 02:50:29 2009 (r195672) +++ projects/jbuild/usr.bin/jbuild/port/Makefile Tue Jul 14 03:22:06 2009 (r195673) @@ -3,9 +3,11 @@ # $FreeBSD$ # +.include ${.CURDIR}/../jbuild_version + PORTNAME= jbuild -PORTDIRNAME= ${PORTNAME} -PORTVERSION= 13 +PORTDIRNAME= ${PORTNAME} +PORTVERSION= ${JBUILD_VERSION} CATEGORIES= devel MAINTAINER= rodrigc@FreeBSD.org Modified: projects/jbuild/usr.bin/make/main.c ============================================================================== --- projects/jbuild/usr.bin/make/main.c Tue Jul 14 02:50:29 2009 (r195672) +++ projects/jbuild/usr.bin/make/main.c Tue Jul 14 03:22:06 2009 (r195673) @@ -1126,6 +1126,9 @@ main(int argc, char **argv) #ifdef MAKE_VERSION Var_SetGlobal("MAKE_VERSION", MAKE_VERSION); #endif +#ifdef JBUILD_VERSION + Var_SetGlobal("JBUILD_VERSION", JBUILD_VERSION); +#endif Var_SetGlobal(".newline", "\n"); /* handy for :@ loops */ { char tmp[64];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907140322.n6E3M6r6043626>