Title: [229711] trunk/Tools
Revision
229711
Author
dba...@webkit.org
Date
2018-03-19 13:49:03 -0700 (Mon, 19 Mar 2018)

Log Message

Make run-webkit-app work for non-GUI apps
https://bugs.webkit.org/show_bug.cgi?id=183701

Reviewed by Lucas Forschler.

Launch the app directly if it is an executable file. Otherwise, assume it is an app bundle
and launch it using open(1) as we currently do.

Note that open(1) is meant for launching GUI apps. Standard output and standard error are
not sent to the tty when using open(1) to launch a non-GUI app.

* Scripts/run-webkit-app: We make the assumption that
* Scripts/webkitdirs.pm:
    - Define and export constant DO_NOT_USE_OPEN_COMMAND.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (229710 => 229711)


--- trunk/Tools/ChangeLog	2018-03-19 20:43:36 UTC (rev 229710)
+++ trunk/Tools/ChangeLog	2018-03-19 20:49:03 UTC (rev 229711)
@@ -1,5 +1,22 @@
 2018-03-19  Daniel Bates  <daba...@apple.com>
 
+        Make run-webkit-app work for non-GUI apps
+        https://bugs.webkit.org/show_bug.cgi?id=183701
+
+        Reviewed by Lucas Forschler.
+
+        Launch the app directly if it is an executable file. Otherwise, assume it is an app bundle
+        and launch it using open(1) as we currently do.
+
+        Note that open(1) is meant for launching GUI apps. Standard output and standard error are
+        not sent to the tty when using open(1) to launch a non-GUI app.
+
+        * Scripts/run-webkit-app: We make the assumption that 
+        * Scripts/webkitdirs.pm:
+            - Define and export constant DO_NOT_USE_OPEN_COMMAND.
+
+2018-03-19  Daniel Bates  <daba...@apple.com>
+
         run-webkit-app -g does not work
         https://bugs.webkit.org/show_bug.cgi?id=183699
 

Modified: trunk/Tools/Scripts/run-webkit-app (229710 => 229711)


--- trunk/Tools/Scripts/run-webkit-app	2018-03-19 20:43:36 UTC (rev 229710)
+++ trunk/Tools/Scripts/run-webkit-app	2018-03-19 20:49:03 UTC (rev 229711)
@@ -48,4 +48,5 @@
 if (isIOSWebKit()) {
     exit exitStatus(runIOSWebKitApp($appPath));
 }
-exit exitStatus(runMacWebKitApp($appPath, USE_OPEN_COMMAND));
+my $isExecutable = -f $appPath && -x $appPath;
+exit exitStatus(runMacWebKitApp($appPath, $isExecutable ? DO_NOT_USE_OPEN_COMMAND : USE_OPEN_COMMAND));

Modified: trunk/Tools/Scripts/webkitdirs.pm (229710 => 229711)


--- trunk/Tools/Scripts/webkitdirs.pm	2018-03-19 20:43:36 UTC (rev 229710)
+++ trunk/Tools/Scripts/webkitdirs.pm	2018-03-19 20:49:03 UTC (rev 229711)
@@ -92,6 +92,7 @@
        &shutDownIOSSimulatorDevice
        &willUseIOSDeviceSDK
        &willUseIOSSimulatorSDK
+       DO_NOT_USE_OPEN_COMMAND
        SIMULATOR_DEVICE_SUFFIX_FOR_WEBKIT_DEVELOPMENT
        USE_OPEN_COMMAND
    );
@@ -114,6 +115,7 @@
 };
 
 use constant USE_OPEN_COMMAND => 1; # Used in runMacWebKitApp().
+use constant DO_NOT_USE_OPEN_COMMAND => 2;
 use constant SIMULATOR_DEVICE_STATE_SHUTDOWN => "1";
 use constant SIMULATOR_DEVICE_STATE_BOOTED => "3";
 use constant SIMULATOR_DEVICE_SUFFIX_FOR_WEBKIT_DEVELOPMENT  => "For WebKit Development";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to