Merge lp:~jamesh/libunity/scope-loader-dash-m into lp:libunity

[James Henstridge]

Add a '-m' flag to unity-scope-loader to help with testing not-yet-installed scopes.

Add a '-m' flag to unity-scope-loader, similar to the Python scope loader.

This takes a shared library as an argument and loads the scope(s) from that library directly rather than going indirect through a scope or group file. This is intended to help developers test their scopes in-tree, so they don't need to have a scope file that points at the copy of the library in their build tree in order to test the code prior to installation.

It is not intended for use with installed code, as mentioned in the help text.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/libunity-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/51

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/66/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Looks fine, but we should make sure this is really only used for testing, not in production.

review: Approve

=== modified file 'loader/scope-loader.vala'
--- loader/scope-loader.vala	2013-07-01 09:58:31 +0000
+++ loader/scope-loader.vala	2013-07-17 09:50:46 +0000
@@ -3,6 +3,7 @@
 namespace Options
 {
   private static string group;
+  private static string module;
 }
 
 const OptionEntry[] options =
@@ -12,6 +13,10 @@
     "Scope group configuration", null
   },
   {
+    "module", 'm', 0, OptionArg.STRING, out Options.module,
+    "Scope shared library (for testing)", null
+  },
+  {
     null
   }
 };
@@ -36,6 +41,10 @@
     {
       loader.load_group (Options.group);
     }
+    else if (Options.module != null)
+    {
+      loader.load_module (Options.module, "C");
+    }
     else
     {
       for (var i = 1; i < args.length; i++)