[Branch,~glmark2-dev/glmark2/trunk] Rev 95: Automatically set the application version in the man page.

Message ID	20110721123636.17019.22546.launchpad@loganberry.canonical.com
State	Accepted
Headers	show Return-Path: <patch+caf_=linaro-patchwork=canonical.com@linaro.org> Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Content-Type: multipart/mixed; boundary="===============2419314933796092768==" MIME-Version: 1.0 To: Linaro Patch Tracker <patches@linaro.org> From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 95: Automatically set the application version in the man page. Message-Id: <20110721123636.17019.22546.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:36 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk

Message ID

20110721123636.17019.22546.launchpad@loganberry.canonical.com

State

Accepted

Headers

Received-SPF: pass (google.com: best guess record for domain of
	bounces@canonical.com designates 91.189.90.139 as permitted
	sender) client-ip=91.189.90.139; 
Content-Type: multipart/mixed;
	boundary="===============2419314933796092768=="
MIME-Version: 1.0
To: Linaro Patch Tracker <patches@linaro.org>
From: noreply@launchpad.net
Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 95: Automatically set the
	application version in the man page.
Message-Id: <20110721123636.17019.22546.launchpad@loganberry.canonical.com>
Date: Thu, 21 Jul 2011 12:36:36 -0000
Reply-To: noreply@launchpad.net
Sender: bounces@canonical.com
Errors-To: bounces@canonical.com
Precedence: bulk

Commit Message

alexandros.frantzis@linaro.org July 21, 2011, 12:36 p.m. UTC

------------------------------------------------------------
revno: 95
tags: 2011.06
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
timestamp: Fri 2011-06-24 15:17:59 +0300
message:
  Automatically set the application version in the man page.
modified:
  doc/glmark2.1.in
  doc/wscript_build
  wscript


--
lp:glmark2
https://code.launchpad.net/~glmark2-dev/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription

=== modified file 'doc/glmark2.1.in'
--- doc/glmark2.1.in	2011-06-23 12:44:17 +0000
+++ doc/glmark2.1.in	2011-06-24 12:17:59 +0000
@@ -1,4 +1,4 @@ 
-.TH @APPNAME@ "1" "June 2011" "@appname@ 11.06"
+.TH @APPNAME@ "1" "June 2011" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS

=== modified file 'doc/wscript_build'
--- doc/wscript_build	2011-06-21 14:46:40 +0000
+++ doc/wscript_build	2011-06-24 12:17:59 +0000
@@ -5,6 +5,7 @@ 
         target = bld.path.find_or_declare('glmark2.1'),
         APPNAME = 'GLMARK2',
         appname = 'glmark2',
+        appversion = bld.env.GLMARK2_VERSION,
         install_path = '${PREFIX}/share/man/man1'
     )
 
@@ -15,5 +16,6 @@ 
         target = bld.path.find_or_declare('glmark2-es2.1'),
         APPNAME = 'GLMARK2-ES2',
         appname = 'glmark2-es2',
+        appversion = bld.env.GLMARK2_VERSION,
         install_path = '${PREFIX}/share/man/man1'
     )

=== modified file 'wscript'
--- wscript	2011-06-24 09:25:13 +0000
+++ wscript	2011-06-24 12:17:59 +0000
@@ -77,6 +77,7 @@ 
     ctx.env.append_unique('GLMARK_DATA_PATH', Options.options.data_path)
     ctx.env.append_unique('DEFINES', 'GLMARK_DATA_PATH="%s"' % Options.options.data_path)
     ctx.env.append_unique('DEFINES', 'GLMARK_VERSION="%s"' % VERSION)
+    ctx.env.GLMARK2_VERSION = VERSION
 
     ctx.env.USE_GL = Options.options.gl
     ctx.env.USE_GLESv2 = Options.options.glesv2