Changeset 218344 in webkit

Timestamp:

Jun 15, 2017 11:44:42 AM (7 years ago)

Author:

clopez@igalia.com

Message:

[WPE] The run-minibrowser script should allow to execute also a WPE launcher
​https://bugs.webkit.org/show_bug.cgi?id=173061

Reviewed by Žan Doberšek.

Launch dyz <​https://github.com/Igalia/dyz> with the script
run-minibrowser for the wpe port. It is now built as part of the
WPE dependencies with JHBuild.

• Scripts/run-minibrowser:
• Scripts/webkitdirs.pm:

(launcherPath):
(launcherName):

• wpe/install-dependencies: Luajit is needed for building dyz.
• wpe/jhbuild.modules: Add dyz and update the revision for WPEBackend-mesa.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-minibrowser (modified) (2 diffs)
• Scripts/webkitdirs.pm (modified) (2 diffs)
• wpe/install-dependencies (modified) (4 diffs)
• wpe/jhbuild.modules (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-06-15  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [WPE] The run-minibrowser script should allow to execute also a WPE launcher
+        https://bugs.webkit.org/show_bug.cgi?id=173061
+
+        Reviewed by Žan Doberšek.
+
+        Launch dyz <https://github.com/Igalia/dyz> with the script
+        run-minibrowser for the wpe port. It is now built as part of the
+        WPE dependencies with JHBuild.
+
+        * Scripts/run-minibrowser:
+        * Scripts/webkitdirs.pm:
+        (launcherPath):
+        (launcherName):
+        * wpe/install-dependencies: Luajit is needed for building dyz.
+        * wpe/jhbuild.modules: Add dyz and update the revision for WPEBackend-mesa.
+
 2017-06-15  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/Scripts/run-minibrowser

@@ -38 +38 @@
 use webkitdirs;
 
+my $launcherName;
 my $launcherPath;
 my @jhbuildWrapper;
@@ -53 +54 @@
     print "Starting MiniBrowser.\n";
     exec @jhbuildWrapper, $launcherPath, @ARGV or die;
+} elsif (isWPE()) {
+    # Check to see that all the frameworks are built.
+    checkFrameworks();
+
+    $launcherName = launcherName();
+    @jhbuildWrapper = wrapperPrefixIfNeeded();
+    $ENV{"WEBKIT_EXEC_PATH"} = catdir(productDir(), "bin");
+    $ENV{"LD_LIBRARY_PATH"} = catdir(productDir(), "lib") . (defined $ENV{"LD_LIBRARY_PATH"} ? ":" . $ENV{"LD_LIBRARY_PATH"} : "" );
+    print "Starting $launcherName \n";
+    exec @jhbuildWrapper, $launcherName, @ARGV or die;
 } elsif (isAppleCocoaWebKit()) {
     printHelpAndExitForRunAndDebugWebKitAppIfNeeded();

trunk/Tools/Scripts/webkitdirs.pm

@@ -1530 +1530 @@
 {
     my $relativeScriptsPath = relativeScriptsDir();
-    if (isGtk()) {
+    if (isGtk() || isWPE()) {
         return "$relativeScriptsPath/run-minibrowser";
     } elsif (isAppleWebKit()) {
         return "$relativeScriptsPath/run-safari";
-    } elsif (isWPE()) {
-        return "$relativeScriptsPath/run-wpe";
     }
 }
@@ -1548 +1546 @@
         return "MiniBrowser";
     } elsif (isWPE()) {
-        return "WPELauncher";
+        return "dyz";
     }
 }

trunk/Tools/wpe/install-dependencies

@@ -106 +106 @@
         libgbm-dev \
         libgles2-mesa-dev \
+        libluajit-5.1-dev \
         libopus-dev \
         liborc-0.4-dev \
@@ -115 +116 @@
         libvorbis-dev \
         libvpx-dev \
-        libxcb-xkb-dev"
+        libxcb-xkb-dev \
+        luajit"
 
     # These are dependencies necessary for using webkit-patch
@@ -193 +195 @@
         libvpx \
         libxcb \
+        luajit \
         mesa \
         mesa-libgl \
@@ -264 +267 @@
         libvpx-devel \
         libxcb-devel \
+        luajit \
+        luajit-devel \
         mesa-libgbm-devel \
         mesa-libGLES-devel \

trunk/Tools/wpe/jhbuild.modules

@@ -25 +25 @@
       <dep package="libgpg-error"/>
       <dep package="libgcrypt"/>
+      <dep package="dyz"/>
     </dependencies>
   </metamodule>
@@ -247 +248 @@
     </dependencies>
     <branch repo="github.com" module="WebPlatformForEmbedded/WPEBackend-mesa.git"
-            tag="daaee710314404cc84fcfd17cb963961d64abfba" />
+            tag="de843e2536f3a445737ce39ab643516a23531d5e" />
   </cmake>
 
@@ -269 +270 @@
     </dependencies>
   </autotools>
+
+  <autotools id="dyz" supports-non-srcdir-builds="no">
+    <branch repo="github.com" module="Igalia/dyz" tag="0880252bac243add39ea54c0797ceb167d775ce9"/>
+  </autotools>
+
 </moduleset>