Merge lp:~robert-ancell/mir/parse-options into lp:~mir-team/mir/trunk

[Robert Ancell]

Allow an application to override the options being populated

[Alan Griffiths (alan-griffiths)]

We don't need to share ownership so T& is a better parameter type than shared_ptr<T>

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

Cool

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1066
http://jenkins.qa.ubuntu.com/job/mir-ci/1510/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2038
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1923
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/748/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/24/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1510/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-09-06 16:46:38 +0000
+++ include/server/mir/default_server_configuration.h	2013-09-18 16:24:45 +0000
@@ -235,6 +235,7 @@
     // own options. This MUST be called before the first invocation of
     // the_options() - typically during construction.
     boost::program_options::options_description_easy_init add_options();
+    virtual void parse_options(options::ProgramOption& options) const;
     virtual std::shared_ptr<options::Option> the_options() const;
 
     virtual std::shared_ptr<input::InputChannelFactory> the_input_channel_factory();

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-09-11 10:06:57 +0000
+++ src/server/default_server_configuration.cpp	2013-09-18 16:24:45 +0000
@@ -193,7 +193,7 @@
 
 void parse_arguments(
     boost::program_options::options_description desc,
-    std::shared_ptr<mir::options::ProgramOption> const& options,
+    mir::options::ProgramOption& options,
     int argc,
     char const* argv[])
 {
@@ -204,9 +204,9 @@
         desc.add_options()
             ("help,h", "this help text");
 
-        options->parse_arguments(desc, argc, argv);
+        options.parse_arguments(desc, argc, argv);
 
-        if (options->is_set("help"))
+        if (options.is_set("help"))
         {
             std::ostringstream help_text;
             help_text << desc;
@@ -223,9 +223,9 @@
 
 void parse_environment(
     boost::program_options::options_description& desc,
-    std::shared_ptr<mir::options::ProgramOption> const& options)
+    mir::options::ProgramOption& options)
 {
-    options->parse_environment(desc, "MIR_SERVER_");
+    options.parse_environment(desc, "MIR_SERVER_");
 }
 }
 
@@ -294,15 +294,18 @@
     return the_options()->get(server_socket_opt, default_server_socket);
 }
 
+void mir::DefaultServerConfiguration::parse_options(mir::options::ProgramOption& options) const
+{
+    parse_arguments(*program_options, options, argc, argv);
+    parse_environment(*program_options, options); 
+}
+
 std::shared_ptr<mir::options::Option> mir::DefaultServerConfiguration::the_options() const
 {
     if (!options)
     {
         auto options = std::make_shared<mir::options::ProgramOption>();
-
-        parse_arguments(*program_options, options, argc, argv);
-        parse_environment(*program_options, options);
-
+        parse_options(*options);
         this->options = options;
     }
     return options;