Title: [240149] trunk/Tools
- Revision
- 240149
- Author
- [email protected]
- Date
- 2019-01-18 08:12:44 -0800 (Fri, 18 Jan 2019)
Log Message
[WPE] run-qt-wpe-minibrowser needlessly expects a --wpe argument
https://bugs.webkit.org/show_bug.cgi?id=193575
Reviewed by Michael Catanzaro.
Allow the script to run without explicit port argument because
it's specific to the WPE port anyway.
* Scripts/run-qt-wpe-minibrowser: Manually insert --wpe in argv
and simplify the rest of the code accordingly.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (240148 => 240149)
--- trunk/Tools/ChangeLog 2019-01-18 15:59:22 UTC (rev 240148)
+++ trunk/Tools/ChangeLog 2019-01-18 16:12:44 UTC (rev 240149)
@@ -1,3 +1,16 @@
+2019-01-18 Philippe Normand <[email protected]>
+
+ [WPE] run-qt-wpe-minibrowser needlessly expects a --wpe argument
+ https://bugs.webkit.org/show_bug.cgi?id=193575
+
+ Reviewed by Michael Catanzaro.
+
+ Allow the script to run without explicit port argument because
+ it's specific to the WPE port anyway.
+
+ * Scripts/run-qt-wpe-minibrowser: Manually insert --wpe in argv
+ and simplify the rest of the code accordingly.
+
2019-01-18 Charlie Turner <[email protected]>
[GStreamer][EME][ClearKey] Request keys from CDMInstance rather than passing via bus messages
Modified: trunk/Tools/Scripts/run-qt-wpe-minibrowser (240148 => 240149)
--- trunk/Tools/Scripts/run-qt-wpe-minibrowser 2019-01-18 15:59:22 UTC (rev 240148)
+++ trunk/Tools/Scripts/run-qt-wpe-minibrowser 2019-01-18 16:12:44 UTC (rev 240149)
@@ -25,36 +25,34 @@
use lib $FindBin::Bin;
use webkitdirs;
+setConfiguration();
+
+if (!inFlatpakSandbox()) {
+ push @ARGV, "--wpe";
+}
+
my $launcherName;
my $libPath;
my $launcherPath;
my @jhbuildWrapper;
+my $configuration = passedConfiguration();
+my $productDir = productDir();
-prohibitUnknownPort();
-setConfiguration();
+$libPath = "/app/webkit/WebKitBuild/$configuration/lib/qml" if $configuration;
+$ENV{"QML2_IMPORT_PATH"} = "$libPath" if $libPath;
+runInFlatpakIfAvailable("/app/webkit/Tools/Scripts/run-qt-wpe-minibrowser");
-if (isWPE()) {
- my $configuration = passedConfiguration();
- my $productDir = productDir();
- my $libPath;
- $libPath = "/app/webkit/WebKitBuild/$configuration/lib/qml" if $configuration;
+# Check to see that all the frameworks are built.
+checkFrameworks();
+
+if (!inFlatpakSandbox()) {
+ $libPath = "$productDir/lib/qml" if $productDir;
$ENV{"QML2_IMPORT_PATH"} = "$libPath" if $libPath;
- runInFlatpakIfAvailable("/app/webkit/Tools/Scripts/run-qt-wpe-minibrowser");
+}
- # Check to see that all the frameworks are built.
- checkFrameworks();
+$launcherPath = catdir($productDir, "bin", "qt-wpe-mini-browser");
+die "Can't find $launcherPath" unless -x $launcherPath;
+@jhbuildWrapper = wrapperPrefixIfNeeded();
- if (!inFlatpakSandbox()) {
- $libPath = "$productDir/lib/qml" if $productDir;
- $ENV{"QML2_IMPORT_PATH"} = "$libPath" if $libPath;
- }
-
- $launcherPath = catdir($productDir, "bin", "qt-wpe-mini-browser");
- die "Can't find $launcherPath" unless -x $launcherPath;
- @jhbuildWrapper = wrapperPrefixIfNeeded();
-
- print "Starting MiniBrowser.\n";
- exec @jhbuildWrapper, $launcherPath, @ARGV or die;
-} else {
- die "Unsupported platform."
-}
+print "Starting MiniBrowser.\n";
+exec @jhbuildWrapper, $launcherPath, @ARGV or die;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
