From patchwork Thu Jul 21 12:36:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexandros.frantzis@linaro.org X-Patchwork-Id: 2934 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id F1D0B23F52 for ; Thu, 21 Jul 2011 12:42:04 +0000 (UTC) Received: from mail-qy0-f180.google.com (mail-qy0-f180.google.com [209.85.216.180]) by fiordland.canonical.com (Postfix) with ESMTP id C178AA18398 for ; Thu, 21 Jul 2011 12:42:04 +0000 (UTC) Received: by mail-qy0-f180.google.com with SMTP id 30so845420qyk.11 for ; Thu, 21 Jul 2011 05:42:04 -0700 (PDT) Received: by 10.229.25.212 with SMTP id a20mr173657qcc.148.1311252124552; Thu, 21 Jul 2011 05:42:04 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.217.78 with SMTP id hl14cs139471qcb; Thu, 21 Jul 2011 05:42:04 -0700 (PDT) Received: by 10.227.55.130 with SMTP id u2mr192131wbg.41.1311251797729; Thu, 21 Jul 2011 05:36:37 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id fh19si2382998wbb.85.2011.07.21.05.36.37; Thu, 21 Jul 2011 05:36:37 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QjsUW-0000D2-Vd for ; Thu, 21 Jul 2011 12:36:37 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id EC45C2E802E for ; Thu, 21 Jul 2011 12:36:36 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glmark2 X-Launchpad-Branch: ~glmark2-dev/glmark2/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 95 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker 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 X-Generated-By: Launchpad (canonical.com); Revision="13475"; Instance="initZopeless config overlay" X-Launchpad-Hash: a4726ac60331799108ca08abe0e8f98c6b225127 ------------------------------------------------------------ revno: 95 tags: 2011.06 committer: Alexandros Frantzis 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