← Back to branch summary

~raof/mir/blowup-eventhub

« back to all changes in this revision

Viewing changes to src/server/default_configuration_options.cpp

  • Committer: Tarmac
  • Author(s): Alan Griffiths
  • Date: 2014-01-28 16:05:11 UTC
  • mfrom: (1357.1.6 mir1)
  • Revision ID: tarmac-20140128160511-awswf6rb0zqd509p
config: some initial tidy up to the mess that is our configuration handling.

Approved by Alexandros Frantzis, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/default_configuration_options.cpp
66
66
}
67
67
}
68
68
 
69
 
char const* const mir::ConfigurationOptions::server_socket_opt           = "file";
 
69
char const* const mir::ConfigurationOptions::server_socket_opt           = "file,f";
70
70
char const* const mir::ConfigurationOptions::no_server_socket_opt        = "no-file";
 
71
char const* const mir::ConfigurationOptions::enable_input_opt            = "enable-input,i";
71
72
char const* const mir::ConfigurationOptions::session_mediator_report_opt = "session-mediator-report";
72
73
char const* const mir::ConfigurationOptions::msg_processor_report_opt    = "msg-processor-report";
73
74
char const* const mir::ConfigurationOptions::compositor_report_opt       = "compositor-report";
78
79
char const* const mir::ConfigurationOptions::input_report_opt            = "input-report";
79
80
char const* const mir::ConfigurationOptions::host_socket_opt             = "host-socket";
80
81
char const* const mir::ConfigurationOptions::standalone_opt              = "standalone";
81
 
char const* const mir::ConfigurationOptions::frontend_threads            = "ipc-thread-pool";
 
82
char const* const mir::ConfigurationOptions::frontend_threads_opt        = "ipc-thread-pool";
82
83
char const* const mir::ConfigurationOptions::name_opt                    = "name";
83
84
char const* const mir::ConfigurationOptions::offscreen_opt               = "offscreen";
84
85
 
114
115
            "Run mir in standalone mode. [bool:default=false]")
115
116
        (host_socket_opt, po::value<std::string>(),
116
117
            "Host socket filename. [string:default={$MIR_SOCKET,$XDG_RUNTIME_DIR/mir_socket}]")
117
 
        ("file,f", po::value<std::string>(),
 
118
        (server_socket_opt, po::value<std::string>(),
118
119
            "Socket filename. [string:default=$XDG_RUNTIME_DIR/mir_socket]")
119
120
        (no_server_socket_opt, "Do not provide a socket filename for client connections")
120
121
        (platform_graphics_lib, po::value<std::string>(),
121
122
            "Library to use for platform graphics support [default=libmirplatformgraphics.so]")
122
 
        ("enable-input,i", po::value<bool>(),
 
123
        (enable_input_opt, po::value<bool>(),
123
124
            "Enable input. [bool:default=true]")
124
125
        (compositor_report_opt, po::value<std::string>(),
125
126
            "Compositor reporting [{log,off}:default=off]")
154
155
            "If specified, logfiles are written into this "
155
156
            "directory instead of the default logging directory."
156
157
            " [string:default=\"\"]")
157
 
        ("ipc-thread-pool", po::value<int>(),
 
158
        (frontend_threads_opt, po::value<int>(),
158
159
            "threads in frontend thread pool.")
159
160
        (name_opt, po::value<std::string>(),
160
161
            "When nested, the name Mir uses when registering with the host.")