Title: [105519] trunk/Tools
- Revision
- 105519
- Author
- [email protected]
- Date
- 2012-01-20 08:49:25 -0800 (Fri, 20 Jan 2012)
Log Message
[GTK] Allow extra jhbuild modulesets
https://bugs.webkit.org/show_bug.cgi?id=76691
Reviewed by Gustavo Noronha Silva.
* gtk/jhbuildrc: Extra modulesets and modules can be added in
JHBuild using the WEBKIT_EXTRA_MODULESETS and WEBKIT_EXTRA_MODULES
env variables respectively. Use comma-separated values. Example:
WEBKIT_EXTRA_MODULES=file:///path/to/module.set,file:///other/path.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (105518 => 105519)
--- trunk/Tools/ChangeLog 2012-01-20 16:32:35 UTC (rev 105518)
+++ trunk/Tools/ChangeLog 2012-01-20 16:49:25 UTC (rev 105519)
@@ -1,3 +1,15 @@
+2012-01-20 Philippe Normand <[email protected]>
+
+ [GTK] Allow extra jhbuild modulesets
+ https://bugs.webkit.org/show_bug.cgi?id=76691
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * gtk/jhbuildrc: Extra modulesets and modules can be added in
+ JHBuild using the WEBKIT_EXTRA_MODULESETS and WEBKIT_EXTRA_MODULES
+ env variables respectively. Use comma-separated values. Example:
+ WEBKIT_EXTRA_MODULES=file:///path/to/module.set,file:///other/path.
+
2012-01-20 Mario Sanchez Prada <[email protected]>
[GTK] Expose accessibility hierarchy in WebKit2 to ATK/AT-SPI based ATs
Modified: trunk/Tools/gtk/jhbuildrc (105518 => 105519)
--- trunk/Tools/gtk/jhbuildrc 2012-01-20 16:32:35 UTC (rev 105518)
+++ trunk/Tools/gtk/jhbuildrc 2012-01-20 16:49:25 UTC (rev 105519)
@@ -23,10 +23,17 @@
build_policy = 'updated'
-__module_file_path = os.path.join(__gtk_tools_directory, 'jhbuild.modules')
-moduleset = 'file://' + __module_file_path
+__moduleset_file_uri = 'file://' + os.path.join(__gtk_tools_directory, 'jhbuild.modules')
+__extra_modulesets = os.environ.get("WEBKIT_EXTRA_MODULESETS", "").split(",")
+moduleset = [ __moduleset_file_uri, ]
+if __extra_modulesets != ['']:
+ moduleset.extend(__extra_modulesets)
-modules = [ 'webkitgtk-testing-dependencies' ]
+__extra_modules = os.environ.get("WEBKIT_EXTRA_MODULES", "").split(",")
+modules = [ 'webkitgtk-testing-dependencies', ]
+if __extra_modules != ['']:
+ modules.extend(__extra_modules)
+
checkoutroot = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Source'))
prefix = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Root'))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
