From patchwork Tue Aug 7 12:10:15 2012 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: 10567 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 A194C24055 for ; Tue, 7 Aug 2012 12:10:18 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4B83AA18760 for ; Tue, 7 Aug 2012 12:10:18 +0000 (UTC) Received: by yenq6 with SMTP id q6so3572259yen.11 for ; Tue, 07 Aug 2012 05:10:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to: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=kMo0N9pB/ujIbhfGDFOcOrVgyTKL9GCGChJsWnpQmxg=; b=JtWxV2YeILPtuiKg7jEllIIZ7JDPs3zs3A9/bwVxq95cN+gSwuVeUIryQ8dGPFFKTX PTchcYFLSORfzlRPX1Ss+1qVvfBw0gszD62V6L/jAPgy++64xVR4bBGjhlsW+za0tu/f 0p+Q09BTDe31yC50HrJN5ud/wKMmS8l13tb1nOGrBW+7izx57iUfv/C5VUtgl7j1v38X jqRhSudAa3w2e+M9VNFEt4JiYiovY1IMDlyZeRmp/uGS5yPvX0U58ypZzejm6MTxeDF/ jJODJkFvOMo50nt/N6kXKpQW6YjhoCQEH11HaZbqyMubvqDt1lC0Agab6tkw/ZYvSJMa 0t0Q== Received: by 10.50.94.166 with SMTP id dd6mr8267675igb.11.1344341417646; Tue, 07 Aug 2012 05:10:17 -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.50.87.40 with SMTP id u8csp494689igz; Tue, 7 Aug 2012 05:10:16 -0700 (PDT) Received: by 10.216.237.149 with SMTP id y21mr7682561weq.102.1344341416182; Tue, 07 Aug 2012 05:10:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id n61si19792848wem.9.2012.08.07.05.10.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 05:10:16 -0700 (PDT) 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 1Syic3-0001Rq-Ih for ; Tue, 07 Aug 2012 12:10:15 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 77B01E012B for ; Tue, 7 Aug 2012 12:10: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: 243 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 243: Build: Convert waf usage to gnu_dirs. Message-Id: <20120807121015.11234.59442.launchpad@ackee.canonical.com> Date: Tue, 07 Aug 2012 12:10: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="15745"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 86d1f457981b7db6e04d06f8bc52015e5defc81d X-Gm-Message-State: ALoCoQl3Q/hLnpDoMsIvM/wDBY2Sp2Ih2hJS0KplE8UN/pxmenIWuoPwrQMa4LgTnRNOAfTQmPcD ------------------------------------------------------------ revno: 243 author: Mike Frysinger , Alexandros Frantzis committer: Alexandros Frantzis branch nick: trunk timestamp: Tue 2012-08-07 15:04:04 +0300 message: Build: Convert waf usage to gnu_dirs. Use the standard gnu_dirs module that waf already includes. Keep the '--data-path' option in order to be able to specify arbitrary data paths, a feature useful for development. modified: 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/wscript_build' --- doc/wscript_build 2011-06-24 12:17:59 +0000 +++ doc/wscript_build 2012-08-07 12:04:04 +0000 @@ -6,7 +6,7 @@ APPNAME = 'GLMARK2', appname = 'glmark2', appversion = bld.env.GLMARK2_VERSION, - install_path = '${PREFIX}/share/man/man1' + install_path = '${MANDIR}/man1' ) if bld.env.USE_GLESv2: @@ -17,5 +17,5 @@ APPNAME = 'GLMARK2-ES2', appname = 'glmark2-es2', appversion = bld.env.GLMARK2_VERSION, - install_path = '${PREFIX}/share/man/man1' + install_path = '${MANDIR}/man1' ) === modified file 'wscript' --- wscript 2012-07-30 09:27:14 +0000 +++ wscript 2012-08-07 12:04:04 +0000 @@ -12,6 +12,7 @@ APPNAME = 'glmark2' def options(opt): + opt.tool_options('gnu_dirs') opt.tool_options('compiler_cc') opt.tool_options('compiler_cxx') @@ -24,7 +25,7 @@ opt.add_option('--no-opt', action='store_false', dest = 'opt', default = True, help='disable compiler optimizations') opt.add_option('--data-path', action='store', dest = 'data_path', - help='the path to install the data to') + help='path to main data (also see --data(root)dir)') opt.add_option('--extras-path', action='store', dest = 'extras_path', help='path to additional data (models, shaders, textures)') @@ -32,6 +33,7 @@ if not Options.options.gl and not Options.options.glesv2: ctx.fatal("You must configure using at least one of --enable-gl, --enable-glesv2") + ctx.check_tool('gnu_dirs') ctx.check_tool('compiler_cc') ctx.check_tool('compiler_cxx') @@ -74,17 +76,19 @@ if Options.options.debug: ctx.env.prepend_value('CXXFLAGS', '-g') - if Options.options.data_path is None: - Options.options.data_path = os.path.join(ctx.env.PREFIX, 'share/glmark2') - ctx.env.HAVE_EXTRAS = False if Options.options.extras_path is not None: ctx.env.HAVE_EXTRAS = True ctx.env.append_unique('GLMARK_EXTRAS_PATH', Options.options.extras_path) ctx.env.append_unique('DEFINES', 'GLMARK_EXTRAS_PATH="%s"' % Options.options.extras_path) - ctx.env.append_unique('GLMARK_DATA_PATH', Options.options.data_path) - ctx.env.append_unique('DEFINES', 'GLMARK_DATA_PATH="%s"' % Options.options.data_path) + if Options.options.data_path is not None: + data_path = Options.options.data_path + else: + data_path = os.path.join(ctx.env.DATADIR, 'glmark2') + + ctx.env.append_unique('GLMARK_DATA_PATH', data_path) + ctx.env.append_unique('DEFINES', 'GLMARK_DATA_PATH="%s"' % data_path) ctx.env.append_unique('DEFINES', 'GLMARK_VERSION="%s"' % VERSION) ctx.env.GLMARK2_VERSION = VERSION @@ -92,7 +96,7 @@ ctx.env.USE_GLESv2 = Options.options.glesv2 ctx.msg("Prefix", ctx.env.PREFIX, color = 'PINK') - ctx.msg("Data path", Options.options.data_path, color = 'PINK') + ctx.msg("Data path", data_path, color = 'PINK') ctx.msg("Including extras", "Yes" if ctx.env.HAVE_EXTRAS else "No", color = 'PINK'); if ctx.env.HAVE_EXTRAS: