Merge lp:~sergiusens/snapcraft/scons_options into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Allow parameters/options for scons

[lp:~sergiusens/snapcraft/scons_options]

218. By Sergio Schvezov on 2015-09-29

Allow parameters/options for scons

[Leo Arias (elopio)]

Could you add options to the scons project in the integration suite, so this is tested?

[Leo Arias (elopio)]

review: Needs Fixing

[lp:~sergiusens/snapcraft/scons_options]

219. By Sergio Schvezov on 2015-09-29

Adding a test

[Leo Arias (elopio)]

/me approves

review: Approve

=== modified file 'integration-tests/data/simple-scons/SConstruct'
--- integration-tests/data/simple-scons/SConstruct	2015-09-29 10:42:52 +0000
+++ integration-tests/data/simple-scons/SConstruct	2015-09-29 19:41:31 +0000
@@ -1,14 +1,22 @@
 import os.path
 
+AddOption('--prefix',
+          dest='prefix',
+          type='string',
+          nargs=1,
+          default='/usr/local',
+          action='store',
+          metavar='DIR',
+          help='installation prefix')
+
 env = Environment()
 hello = env.Program('main.c')
 DESTDIR = os.environ.get('DESTDIR', '')
-install_dir = os.path.join('usr', 'bin')
 
 if DESTDIR:
-   install_dir = os.path.join(DESTDIR, install_dir)
+    install_dir = os.path.join(DESTDIR + os.path.sep + GetOption('prefix'), 'bin')
 else:
-   install_dir = os.path.join(os.path.sep, install_dir)
+    install_dir = os.path.join(GetOption('prefix'), 'bin')
 
-env.Install(install_dir,  hello)
+env.Install(install_dir, hello)
 env.Alias('install', install_dir)

=== modified file 'integration-tests/data/simple-scons/snapcraft.yaml'
--- integration-tests/data/simple-scons/snapcraft.yaml	2015-09-29 13:36:43 +0000
+++ integration-tests/data/simple-scons/snapcraft.yaml	2015-09-29 19:41:31 +0000
@@ -7,5 +7,7 @@
 
 parts:
   scons-project:
+    scons-options:
+      - --prefix=/opt
     plugin: scons-project
     source: .

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-09-29 11:44:18 +0000
+++ integration-tests/units/jobs.pxu	2015-09-29 19:41:31 +0000
@@ -107,6 +107,14 @@
     test "$(./stage/bin/test)" = "Hello world"
 flags: simple has-leftovers
 
+id: snapcraft/normal/simple-scons
+command:
+    set -ex
+    cp -rT $PLAINBOX_PROVIDER_DATA/simple-scons .
+    ${SNAPCRAFT} stage
+    test "$(./stage/opt/bin/main)" = "Hello world"
+flags: simple has-leftovers
+
 id: snapcraft/normal/simple-make-filesets
 command:
     set -ex

=== modified file 'plugins/scons-project.yaml'
--- plugins/scons-project.yaml	2015-09-29 09:07:45 +0000
+++ plugins/scons-project.yaml	2015-09-29 19:41:31 +0000
@@ -3,6 +3,7 @@
 options:
   source:
     required: true
+  scons-options:
   source-type:
   source-tag:
   source-branch:

=== modified file 'snapcraft/plugins/scons_project.py'
--- snapcraft/plugins/scons_project.py	2015-09-29 09:07:45 +0000
+++ snapcraft/plugins/scons_project.py	2015-09-29 19:41:31 +0000
@@ -21,11 +21,17 @@
 
 class SconsPlugin(snapcraft.BasePlugin):
 
+    def __init__(self, name, options):
+        super().__init__(name, options)
+        self.scons_options = []
+        if options.scons_options:
+            self.scons_options = options.scons_options
+
     def pull(self):
         return self.handle_source_options()
 
     def build(self):
         env = os.environ.copy()
         env['DESTDIR'] = self.installdir
-        return self.run(['scons', 'prefix=/usr']) and \
-            self.run(['scons', 'install'], env=env)
+        return (self.run(['scons', ] + self.scons_options) and
+                self.run(['scons', 'install'] + self.scons_options, env=env))