From 6c674e923de880301293fbeb916e218f8ef925d2 Mon Sep 17 00:00:00 2001 From: nedko Date: Thu, 22 May 2008 22:28:13 +0000 Subject: [PATCH] * Detect svn revision * Add JACK_SVNREVISION define to config.h * Display JACK version being built git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2315 0c269be4-1314-0410-8aa9-9f06e86f4224 --- SConstruct | 11 +++++++++++ config.h.in | 2 ++ 2 files changed, 13 insertions(+) diff --git a/SConstruct b/SConstruct index 647fce9a..f8fb1c28 100644 --- a/SConstruct +++ b/SConstruct @@ -21,6 +21,7 @@ import os from string import Template +import commands JACK_MAJOR_VERSION=1 JACK_MINOR_VERSION=9 @@ -30,9 +31,18 @@ JACKAPI_MAJOR_VERSION=0 JACKAPI_MINOR_VERSION=1 JACKAPI_MICRO_VERSION=0 +def fetch_svn_revision(path): + cmd = "LANG= " + cmd += "svnversion " + cmd += path + return commands.getoutput(cmd) + +JACK_SVNREVISION=fetch_svn_revision('.') JACK_VERSION="%u.%u.%u" % (JACK_MAJOR_VERSION, JACK_MINOR_VERSION, JACK_MICRO_VERSION) JACKAPI_VERSION="%u.%u.%u" % (JACKAPI_MAJOR_VERSION, JACKAPI_MINOR_VERSION, JACKAPI_MICRO_VERSION) +print "JACK %s (%s)" % (JACK_VERSION, JACK_SVNREVISION) + platform = ARGUMENTS.get('OS', str(Platform())) build_dir = ARGUMENTS.get('BUILDDIR', '') @@ -103,6 +113,7 @@ Help(opts.GenerateHelpText(env)) env['JACK_MAJOR_VERSION'] = JACK_MAJOR_VERSION env['JACK_MINOR_VERSION'] = JACK_MINOR_VERSION env['JACK_MICRO_VERSION'] = JACK_MICRO_VERSION +env['JACK_SVNREVISION'] = JACK_SVNREVISION env['JACK_VERSION'] = JACK_VERSION env['JACKAPI_MAJOR_VERSION'] = JACKAPI_MAJOR_VERSION env['JACKAPI_MINOR_VERSION'] = JACKAPI_MINOR_VERSION diff --git a/config.h.in b/config.h.in index 33f1f90c..e356790d 100644 --- a/config.h.in +++ b/config.h.in @@ -12,4 +12,6 @@ #define JACK_LOCATION "$JACK_LOCATION" +#define JACK_SVNREVISION "$JACK_SVNREVISION" + #endif // CONFIG_H