From patchwork Tue Mar 5 13:27:15 2013 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: 15240 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 5675B23E64 for ; Tue, 5 Mar 2013 13:27:22 +0000 (UTC) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by fiordland.canonical.com (Postfix) with ESMTP id C1DADA18564 for ; Tue, 5 Mar 2013 13:27:21 +0000 (UTC) Received: by mail-ve0-f180.google.com with SMTP id jx10so5732785veb.11 for ; Tue, 05 Mar 2013 05:27:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:content-type:mime-version:x-launchpad-project :x-launchpad-branch:x-launchpad-message-rationale :x-launchpad-branch-revision-number:x-launchpad-notification-type:to :from:subject:message-id:date:reply-to:sender:errors-to:precedence :x-generated-by:x-launchpad-hash:x-gm-message-state; bh=18inuTh9NALuDyyMSmyRGKAI0Wgsqlyax4MD9jb/4r4=; b=ibd19Lnb8QkieCF+pMSjlkfZKcqiCVaK0FvzOj+dQ6cjZ0iA0/GqwT2lE78dixYEJ/ MW8umJbyQFXP4Q8cvabRkIZu+OSo1FUtg8dmvOQwehhbleJfXBpMnWZmjOK7et3Fxki4 Cv6gB+lYY6txyrvirsTDXroVvQ71513Q+8FCX+INFfO5yUgzhrtdypUR32ttbMZ+LBIn il88mxDme5vrSF9Gk4iP/2W0224T1chwF+RC2tPic2kkbYNZVbXOiB008/rlP8VYTsrW eO9zGEmHpSIFBb83e0kTHdmhf//gDIl6LoF1i2w8tWzs+Rwg1UFSRlnYrtSxmrDkBO4I IU2A== X-Received: by 10.52.29.18 with SMTP id f18mr8256558vdh.57.1362490041213; Tue, 05 Mar 2013 05:27:21 -0800 (PST) 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.58.127.98 with SMTP id nf2csp111448veb; Tue, 5 Mar 2013 05:27:17 -0800 (PST) X-Received: by 10.194.5.137 with SMTP id s9mr39207728wjs.5.1362490036573; Tue, 05 Mar 2013 05:27:16 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id un4si10754203wjc.76.2013.03.05.05.27.15 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 05 Mar 2013 05:27:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1UCrtj-0008Po-O6 for ; Tue, 05 Mar 2013 13:27:15 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id A6FF3E011D for ; Tue, 5 Mar 2013 13:27:15 +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: 263 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 263: build, doc: Fix man page creation and installation Message-Id: <20130305132715.26028.97480.launchpad@ackee.canonical.com> Date: Tue, 05 Mar 2013 13:27:15 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16514"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 3bb943b7a55f15946768685f18fc22037bc0e025 X-Gm-Message-State: ALoCoQmP9N/XvrUo3Nlcxka5DRqtprVUHY5us3ggxCgt2PLoESrOe4spyNLyKjwNBVWH0tiwnQu7 ------------------------------------------------------------ revno: 263 committer: Alexandros Frantzis branch nick: trunk timestamp: Tue 2013-03-05 15:23:30 +0200 message: build,doc: Fix man page creation and installation modified: doc/wscript_build src/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/wscript_build' --- doc/wscript_build 2012-08-07 12:04:04 +0000 +++ doc/wscript_build 2013-03-05 13:23:30 +0000 @@ -1,21 +1,12 @@ -if bld.env.USE_GL: - bld( - features = 'subst', - source = 'glmark2.1.in', - target = bld.path.find_or_declare('glmark2.1'), - APPNAME = 'GLMARK2', - appname = 'glmark2', - appversion = bld.env.GLMARK2_VERSION, - install_path = '${MANDIR}/man1' - ) - -if bld.env.USE_GLESv2: - bld( - features = 'subst', - source = 'glmark2.1.in', - target = bld.path.find_or_declare('glmark2-es2.1'), - APPNAME = 'GLMARK2-ES2', - appname = 'glmark2-es2', - appversion = bld.env.GLMARK2_VERSION, - install_path = '${MANDIR}/man1' - ) +for name in bld.env.keys(): + if name.startswith('FLAVOR_') and bld.env[name]: + target = bld.env[name] + bld( + features = 'subst', + source = 'glmark2.1.in', + target = bld.path.find_or_declare('%s.1' % target), + APPNAME = 'GLMARK2', + appname = target, + appversion = bld.env.GLMARK2_VERSION, + install_path = '${MANDIR}/man1' + ) === modified file 'src/wscript_build' --- src/wscript_build 2013-03-04 19:07:07 +0000 +++ src/wscript_build 2013-03-05 13:23:30 +0000 @@ -14,12 +14,6 @@ 'drm-gl' : ['canvas-generic.cpp', 'native-state-drm.cpp', 'gl-state-egl.cpp'], 'drm-glesv2' : ['canvas-generic.cpp', 'native-state-drm.cpp', 'gl-state-egl.cpp'] } -flavor_target = { - 'x11-gl' : 'glmark2', - 'x11-glesv2' : 'glmark2-es2', - 'drm-gl' : 'glmark2-drm', - 'drm-glesv2' : 'glmark2-es2-drm' -} flavor_uselibs = { 'x11-gl' : ['x11', 'gl', 'matrix-gl'], 'x11-glesv2' : ['x11', 'egl', 'glesv2', 'matrix-glesv2'], @@ -40,10 +34,11 @@ for name in bld.env.keys(): if name.startswith('FLAVOR_') and bld.env[name]: flavor = name.replace('FLAVOR_', '').lower().replace('_', '-') + target = bld.env[name] bld( features = ['cxx', 'cprogram'], source = common_sources + flavor_sources[flavor], - target = flavor_target[flavor], + target = target, use = common_uselibs + flavor_uselibs[flavor], lib = ['m', 'jpeg', 'dl'], includes = includes, === modified file 'wscript' --- wscript 2013-03-04 19:07:07 +0000 +++ wscript 2013-03-05 13:23:30 +0000 @@ -11,8 +11,13 @@ VERSION = '2012.12' APPNAME = 'glmark2' -FLAVORS = ['x11-gl', 'x11-glesv2', 'drm-gl', 'drm-glesv2'] -FLAVORS_STR = ", ".join(FLAVORS) +FLAVORS = { + 'x11-gl' : 'glmark2', + 'x11-glesv2' : 'glmark2-es2', + 'drm-gl' : 'glmark2-drm', + 'drm-glesv2' : 'glmark2-es2-drm' +} +FLAVORS_STR = ", ".join(FLAVORS.keys()) def option_list_cb(option, opt, value, parser): value = value.split(',') @@ -49,7 +54,7 @@ def configure(ctx): # Special 'all' flavor if 'all' in Options.options.flavors: - Options.options.flavors = list(set(Options.options.flavors) | set(FLAVORS)) + Options.options.flavors = list(set(Options.options.flavors) | set(FLAVORS.keys())) Options.options.flavors.remove('all') # Ensure the flavors are valid @@ -61,7 +66,8 @@ ctx.fatal('You need to select at least one flavor. Supported flavors are %s' % FLAVORS_STR) for flavor in FLAVORS: - ctx.env["FLAVOR_%s" % flavor.upper().replace('-','_')] = flavor in Options.options.flavors + if flavor in Options.options.flavors: + ctx.env["FLAVOR_%s" % flavor.upper().replace('-','_')] = FLAVORS[flavor] ctx.check_tool('gnu_dirs') ctx.check_tool('compiler_cc')