- Revision
- 92273
- Author
- [email protected]
- Date
- 2011-08-03 05:20:12 -0700 (Wed, 03 Aug 2011)
Log Message
[GTK] Install web and plugin processes in libexecdir instead of bindir
https://bugs.webkit.org/show_bug.cgi?id=65600
Reviewed by Martin Robinson.
.:
* GNUmakefile.am: Initialize libexec_PROGRAMS, only used by
WebKit2 in this moment.
Source/WebKit2:
Launch processes from libexecdir or WEBKIT_EXEC_PATH
environment variable when it's set. This variable will be used by
MiniBrowser and unit tests to find processes without having to
install them.
* GNUmakefile.am:
* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
(WebKit::ProcessLauncher::launchProcess):
Tools:
Set WEBKIT_EXEC_PATH environment variable to use web and plugin
process from current directory instead of the intalled ones.
* MiniBrowser/gtk/GNUmakefile.am:
* MiniBrowser/gtk/main.c:
(main):
* WebKitTestRunner/GNUmakefile.am:
* WebKitTestRunner/gtk/main.cpp:
(main):
Modified Paths
Diff
Modified: trunk/ChangeLog (92272 => 92273)
--- trunk/ChangeLog 2011-08-03 11:55:26 UTC (rev 92272)
+++ trunk/ChangeLog 2011-08-03 12:20:12 UTC (rev 92273)
@@ -1,5 +1,15 @@
2011-08-03 Carlos Garcia Campos <[email protected]>
+ [GTK] Install web and plugin processes in libexecdir instead of bindir
+ https://bugs.webkit.org/show_bug.cgi?id=65600
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am: Initialize libexec_PROGRAMS, only used by
+ WebKit2 in this moment.
+
+2011-08-03 Carlos Garcia Campos <[email protected]>
+
[GTK] Reorganize pkg-config files
https://bugs.webkit.org/show_bug.cgi?id=65548
Modified: trunk/GNUmakefile.am (92272 => 92273)
--- trunk/GNUmakefile.am 2011-08-03 11:55:26 UTC (rev 92272)
+++ trunk/GNUmakefile.am 2011-08-03 12:20:12 UTC (rev 92273)
@@ -45,6 +45,7 @@
# Libraries and support components
bin_PROGRAMS :=
noinst_PROGRAMS :=
+libexec_PROGRAMS :=
noinst_HEADERS :=
noinst_LTLIBRARIES :=
lib_LTLIBRARIES :=
Modified: trunk/Source/WebKit2/ChangeLog (92272 => 92273)
--- trunk/Source/WebKit2/ChangeLog 2011-08-03 11:55:26 UTC (rev 92272)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-03 12:20:12 UTC (rev 92273)
@@ -1,3 +1,19 @@
+2011-08-03 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Install web and plugin processes in libexecdir instead of bindir
+ https://bugs.webkit.org/show_bug.cgi?id=65600
+
+ Reviewed by Martin Robinson.
+
+ Launch processes from libexecdir or WEBKIT_EXEC_PATH
+ environment variable when it's set. This variable will be used by
+ MiniBrowser and unit tests to find processes without having to
+ install them.
+
+ * GNUmakefile.am:
+ * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+ (WebKit::ProcessLauncher::launchProcess):
+
2011-08-03 Pavel Feldman <[email protected]>
Web Inspector: remove Node parameter from the InspectorClient::highlight
Modified: trunk/Source/WebKit2/GNUmakefile.am (92272 => 92273)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-08-03 11:55:26 UTC (rev 92272)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-08-03 12:20:12 UTC (rev 92273)
@@ -844,6 +844,7 @@
-I$(top_builddir)/DerivedSources/WebKit2/include/_javascript_Core \
-I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \
-I$(top_builddir)/DerivedSources/WebKit2/include/WebKit2 \
+ -DLIBEXECDIR=\""$(libexecdir)"\" \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(_javascript_core_cppflags) \
@@ -960,7 +961,7 @@
$(top_builddir)/WebKit2/webkit2gtk-@[email protected]
# WebKitWebProcess
-bin_PROGRAMS += \
+libexec_PROGRAMS += \
Programs/WebKitWebProcess
Programs_WebKitWebProcess_CPPFLAGS = \
@@ -1037,7 +1038,7 @@
$(XT_CFLAGS) \
$(ZLIB_LIBS)
-bin_PROGRAMS += \
+libexec_PROGRAMS += \
Programs/WebKitPluginProcess
Programs_WebKitPluginProcess_CPPFLAGS = \
Modified: trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (92272 => 92273)
--- trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2011-08-03 11:55:26 UTC (rev 92272)
+++ trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2011-08-03 12:20:12 UTC (rev 92273)
@@ -76,7 +76,8 @@
return;
}
- GOwnPtr<gchar> binaryPath(g_build_filename(applicationDirectoryPath().data(),
+ const gchar* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
+ GOwnPtr<gchar> binaryPath(g_build_filename(execDirectory ? execDirectory : LIBEXECDIR,
m_launchOptions.processType == ProcessLauncher::WebProcess ? gWebKitWebProcessName : gWebKitPluginProcessName, NULL));
GOwnPtr<gchar> socket(g_strdup_printf("%d", sockets[0]));
char* argv[3];
Modified: trunk/Tools/ChangeLog (92272 => 92273)
--- trunk/Tools/ChangeLog 2011-08-03 11:55:26 UTC (rev 92272)
+++ trunk/Tools/ChangeLog 2011-08-03 12:20:12 UTC (rev 92273)
@@ -1,3 +1,20 @@
+2011-08-03 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Install web and plugin processes in libexecdir instead of bindir
+ https://bugs.webkit.org/show_bug.cgi?id=65600
+
+ Reviewed by Martin Robinson.
+
+ Set WEBKIT_EXEC_PATH environment variable to use web and plugin
+ process from current directory instead of the intalled ones.
+
+ * MiniBrowser/gtk/GNUmakefile.am:
+ * MiniBrowser/gtk/main.c:
+ (main):
+ * WebKitTestRunner/GNUmakefile.am:
+ * WebKitTestRunner/gtk/main.cpp:
+ (main):
+
2011-08-02 Anders Carlsson <[email protected]>
Add mac-lion platform to old-run-webkit-tests
Modified: trunk/Tools/MiniBrowser/gtk/GNUmakefile.am (92272 => 92273)
--- trunk/Tools/MiniBrowser/gtk/GNUmakefile.am 2011-08-03 11:55:26 UTC (rev 92272)
+++ trunk/Tools/MiniBrowser/gtk/GNUmakefile.am 2011-08-03 12:20:12 UTC (rev 92273)
@@ -4,6 +4,7 @@
Programs_MiniBrowser_CPPFLAGS = \
-I$(srcdir)/Source \
-I$(top_builddir)/DerivedSources/WebKit2/include \
+ -DWEBKIT_EXEC_PATH=\"${shell pwd}/$(top_builddir)/Programs/\" \
$(global_cppflags) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
Modified: trunk/Tools/MiniBrowser/gtk/main.c (92272 => 92273)
--- trunk/Tools/MiniBrowser/gtk/main.c 2011-08-03 11:55:26 UTC (rev 92272)
+++ trunk/Tools/MiniBrowser/gtk/main.c 2011-08-03 12:20:12 UTC (rev 92273)
@@ -93,6 +93,9 @@
}
g_option_context_free (context);
+ // Prefer the not installed web and plugin processes.
+ g_setenv("WEBKIT_EXEC_PATH", WEBKIT_EXEC_PATH, FALSE);
+
WKContextRef processContext = createWKContextWithInjectedBundle();
if (uriArguments) {
Modified: trunk/Tools/WebKitTestRunner/GNUmakefile.am (92272 => 92273)
--- trunk/Tools/WebKitTestRunner/GNUmakefile.am 2011-08-03 11:55:26 UTC (rev 92272)
+++ trunk/Tools/WebKitTestRunner/GNUmakefile.am 2011-08-03 12:20:12 UTC (rev 92273)
@@ -24,6 +24,7 @@
-include Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h \
-I$(srcdir)/Tools/WebKitTestRunner \
-I$(top_builddir)/DerivedSources/WebKit2/include \
+ -DWEBKIT_EXEC_PATH=\"${shell pwd}/$(top_builddir)/Programs/\" \
$(global_cppflags) \
$(_javascript_core_cppflags) \
$(GLOBALDEPS_CFLAGS) \
Modified: trunk/Tools/WebKitTestRunner/gtk/main.cpp (92272 => 92273)
--- trunk/Tools/WebKitTestRunner/gtk/main.cpp 2011-08-03 11:55:26 UTC (rev 92272)
+++ trunk/Tools/WebKitTestRunner/gtk/main.cpp 2011-08-03 12:20:12 UTC (rev 92273)
@@ -31,6 +31,8 @@
int main(int argc, char** argv)
{
gtk_init(&argc, &argv);
+ // Prefer the not installed web and plugin processes.
+ g_setenv("WEBKIT_EXEC_PATH", WEBKIT_EXEC_PATH, FALSE);
WTR::TestController controller(argc, const_cast<const char**>(argv));
return 0;
}
