mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add --version option

Browse Source
This commit is contained in:
Scott Moreau
2012-08-29 15:15:58 -06:00
committed by Kristian Høgsberg
parent d92c09c770
commit 1224514f5b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/weston.man
+4 -1
View File
@@ -104,8 +104,11 @@ or you can pass an absolute path. The default backend is
unless the environment suggests otherwise, see unless the environment suggests otherwise, see
.IR DISPLAY " and " WAYLAND_DISPLAY . .IR DISPLAY " and " WAYLAND_DISPLAY .
.TP .TP
.BR \-\-version
Print the program version.
.TP
.BR \-\^h ", " \-\-help .BR \-\^h ", " \-\-help
Print the program version and a summary of command line options, and quit. Print a summary of command line options, and quit.
.TP .TP
\fB\-\^i\fR\fIN\fR, \fB\-\-idle\-time\fR=\fIN\fR \fB\-\^i\fR\fIN\fR, \fB\-\-idle\-time\fR=\fIN\fR
Set the idle timeout to Set the idle timeout to
src/compositor.c
+8
View File
@@ -3197,6 +3197,7 @@ usage(int error_code)
"Core options:\n\n" "Core options:\n\n"
" --version\t\tPrint weston version\n"
" -B, --backend=MODULE\tBackend module, one of drm-backend.so,\n" " -B, --backend=MODULE\tBackend module, one of drm-backend.so,\n"
"\t\t\t\tx11-backend.so or wayland-backend.so\n" "\t\t\t\tx11-backend.so or wayland-backend.so\n"
" -S, --socket=NAME\tName of socket to listen on\n" " -S, --socket=NAME\tName of socket to listen on\n"
@@ -3249,6 +3250,7 @@ int main(int argc, char *argv[])
int32_t idle_time = 300; int32_t idle_time = 300;
int32_t help = 0; int32_t help = 0;
char *socket_name = "wayland-0"; char *socket_name = "wayland-0";
int32_t version = 0;
char *config_file; char *config_file;
const struct config_key core_config_keys[] = { const struct config_key core_config_keys[] = {
@@ -3267,6 +3269,7 @@ int main(int argc, char *argv[])
{ WESTON_OPTION_STRING, "modules", 0, &option_modules }, { WESTON_OPTION_STRING, "modules", 0, &option_modules },
{ WESTON_OPTION_STRING, "log", 0, &log }, { WESTON_OPTION_STRING, "log", 0, &log },
{ WESTON_OPTION_BOOLEAN, "help", 'h', &help }, { WESTON_OPTION_BOOLEAN, "help", 'h', &help },
{ WESTON_OPTION_BOOLEAN, "version", 0, &version },
}; };
argc = parse_options(core_options, argc = parse_options(core_options,
@@ -3275,6 +3278,11 @@ int main(int argc, char *argv[])
if (help) if (help)
usage(EXIT_SUCCESS); usage(EXIT_SUCCESS);
if (version) {
printf(PACKAGE_STRING "\n");
return EXIT_SUCCESS;
}
weston_log_file_open(log); weston_log_file_open(log);
weston_log("%s\n" weston_log("%s\n"