Changeset 249003 in webkit

Timestamp:

Aug 22, 2019, 4:18:58 AM (7 years ago)

Author:

clopez@igalia.com

Message:

[GTK][WPE] Support for command "--version" on the MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=200978

Reviewed by Žan Doberšek.

Printing the engine version used from the MiniBrowser is useful.
For example, the test scripts on WPT can use this info to better
tag the generated results.

• MiniBrowser/gtk/main.c: Print the engine version when called with --version or -v.

(main):

• MiniBrowser/wpe/main.cpp: Ditto.

(main):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/gtk/main.c (modified) (3 diffs)
• MiniBrowser/wpe/main.cpp (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-08-22  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [GTK][WPE] Support for command "--version" on the MiniBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=200978
+
+        Reviewed by Žan Doberšek.
+
+        Printing the engine version used from the MiniBrowser is useful.
+        For example, the test scripts on WPT can use this info to better
+        tag the generated results.
+
+        * MiniBrowser/gtk/main.c: Print the engine version when called with --version or -v.
+        (main):
+        * MiniBrowser/wpe/main.cpp: Ditto.
+        (main):
+
 2019-08-22  Youenn Fablet  <youenn@apple.com>
 

trunk/Tools/MiniBrowser/gtk/main.c

@@ -54 +54 @@
 static const char *proxy;
 static gboolean darkMode;
+static gboolean printVersion;
 
 typedef enum {
@@ -117 +118 @@
     { "ignore-tls-errors", 0, 0, G_OPTION_ARG_NONE, &ignoreTLSErrors, "Ignore TLS errors", NULL },
     { "content-filter", 0, 0, G_OPTION_ARG_FILENAME, &contentFilter, "JSON with content filtering rules", "FILE" },
+    { "version", 'v', 0, G_OPTION_ARG_NONE, &printVersion, "Print the WebKitGTK version", NULL },
     { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, 0, "[URL…]" },
     { 0, 0, 0, 0, 0, 0, 0 }
@@ -519 +521 @@
     g_option_context_free (context);
 
+    if (printVersion) {
+        g_print("WebKitGTK %d.%d.%d\n",
+            webkit_get_major_version(),
+            webkit_get_minor_version(),
+            webkit_get_micro_version());
+        return 0;
+    }
+
     WebKitWebContext *webContext = (privateMode || automationMode) ? webkit_web_context_new_ephemeral() : webkit_web_context_get_default();
 

trunk/Tools/MiniBrowser/wpe/main.cpp

@@ -49 +49 @@
 static const char* proxy;
 const char* bgColor;
+static gboolean printVersion;
 
 static const GOptionEntry commandLineOptions[] =
@@ -62 +63 @@
     { "content-filter", 0, 0, G_OPTION_ARG_FILENAME, &contentFilter, "JSON with content filtering rules", "FILE" },
     { "bg-color", 0, 0, G_OPTION_ARG_STRING, &bgColor, "Window background color. Default: white", "COLOR" },
+    { "version", 'v', 0, G_OPTION_ARG_NONE, &printVersion, "Print the WPE version", nullptr },
     { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, nullptr, "[URL]" },
     { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
@@ -167 +169 @@
     }
     g_option_context_free(context);
+
+    if (printVersion) {
+        g_print("WPE WebKit %d.%d.%d\n",
+            webkit_get_major_version(),
+            webkit_get_minor_version(),
+            webkit_get_micro_version());
+        return 0;
+    }
 
     auto* loop = g_main_loop_new(nullptr, FALSE);