- Revision
- 101523
- Author
- [email protected]
- Date
- 2011-11-30 09:16:45 -0800 (Wed, 30 Nov 2011)
Log Message
[GTK] Add an initial jhbuild setup which installs fonts into the WebKitBuild
https://bugs.webkit.org/show_bug.cgi?id=73425
Reviewed by Gustavo Noronha Silva.
Add initial jhbuild support to the GTK+ port. update-webkitgtk-libs will
ensure that the jhbuild root is up-to-date. Currently the only module is
the font module.
* Scripts/update-webkitgtk-libs: Added.
* gtk/common.py: Added a helper to get the number of CPUs.
* gtk/jhbuild.modules: Added.
* gtk/jhbuildrc: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (101522 => 101523)
--- trunk/Tools/ChangeLog 2011-11-30 16:57:48 UTC (rev 101522)
+++ trunk/Tools/ChangeLog 2011-11-30 17:16:45 UTC (rev 101523)
@@ -1,3 +1,19 @@
+2011-11-30 Martin Robinson <[email protected]>
+
+ [GTK] Add an initial jhbuild setup which installs fonts into the WebKitBuild
+ https://bugs.webkit.org/show_bug.cgi?id=73425
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Add initial jhbuild support to the GTK+ port. update-webkitgtk-libs will
+ ensure that the jhbuild root is up-to-date. Currently the only module is
+ the font module.
+
+ * Scripts/update-webkitgtk-libs: Added.
+ * gtk/common.py: Added a helper to get the number of CPUs.
+ * gtk/jhbuild.modules: Added.
+ * gtk/jhbuildrc: Added.
+
2011-11-30 Simon Hausmann <[email protected]>
[Qt] Remove dependency of Qt DRT on _javascript_Core.
Added: trunk/Tools/Scripts/update-webkitgtk-libs (0 => 101523)
--- trunk/Tools/Scripts/update-webkitgtk-libs (rev 0)
+++ trunk/Tools/Scripts/update-webkitgtk-libs 2011-11-30 17:16:45 UTC (rev 101523)
@@ -0,0 +1,29 @@
+#!/usr/bin/perl -w
+# Copyright (C) 2011 Igalia S.L.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+use FindBin;
+use lib $FindBin::Bin;
+use webkitdirs;
+
+chdir(relativeScriptsDir() . "/../gtk") or die $!;
+
+print "Updating GTK+ port dependencies using jhbuild...\n";
+my @jhbuildArgs = ("jhbuild", "-f", "jhbuildrc");
+push(@jhbuildArgs, @ARGV[1..-1]);
+if (system(@jhbuildArgs) != 0) {
+ die "Running jhbuild failed."
+}
Property changes on: trunk/Tools/Scripts/update-webkitgtk-libs
___________________________________________________________________
Added: svn:executable
Modified: trunk/Tools/gtk/common.py (101522 => 101523)
--- trunk/Tools/gtk/common.py 2011-11-30 16:57:48 UTC (rev 101522)
+++ trunk/Tools/gtk/common.py 2011-11-30 17:16:45 UTC (rev 101523)
@@ -69,3 +69,9 @@
def build_path(*args):
return os.path.join(*(get_build_path(),) + args)
+
+
+def number_of_cpus():
+ process = subprocess.Popen([script_path('num-cpus')], stdout=subprocess.PIPE)
+ stdout = process.communicate()[0]
+ return int(stdout)
Added: trunk/Tools/gtk/jhbuild.modules (0 => 101523)
--- trunk/Tools/gtk/jhbuild.modules (rev 0)
+++ trunk/Tools/gtk/jhbuild.modules 2011-11-30 17:16:45 UTC (rev 101523)
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href=""
+<moduleset>
+
+ <metamodule id="webkitgtk-testing-dependencies">
+ <dependencies>
+ <dep package="fonts"/>
+ </dependencies>
+ </metamodule>
+
+ <repository type="tarball" name="github.com"
+ href=""
+
+ <autotools id="fonts"
+ skip-autogen="true">
+ <branch module="downloads/mrobinson/webkitgtk-test-fonts/webkitgtk-test-fonts-0.0.1.tar.gz" version="0.0.1"
+ repo="github.com"
+ hash="sha256:df40960ec98bd23de2f6ea8f5135ffc9485929aeddb4f08be5144881a1fd3887"
+ md5sum="2c752a694f41f3ff7aed6e3015250f69" size="6635293">
+ </branch>
+ </autotools>
+
+</moduleset>
Added: trunk/Tools/gtk/jhbuildrc (0 => 101523)
--- trunk/Tools/gtk/jhbuildrc (rev 0)
+++ trunk/Tools/gtk/jhbuildrc 2011-11-30 17:16:45 UTC (rev 101523)
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+# Copyright (C) 2011 Igalia S.L.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import sys
+
+__gtk_tools_directory = os.path.abspath(os.path.dirname(__file__))
+sys.path.append(__gtk_tools_directory)
+import common
+
+build_policy = 'updated'
+
+__module_file_path = os.path.join(__gtk_tools_directory, 'jhbuild.modules')
+moduleset = 'file://' + __module_file_path
+
+modules = [ 'webkitgtk-testing-dependencies' ]
+checkoutroot = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Source'))
+prefix = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Root'))
+
+nonotify = True
+notrayicon = True
+os.environ['MAKEFLAGS'] = '-j' + str(common.number_of_cpus())
+
+# Use system libraries while building.
+if use_lib64:
+ _libdir = 'lib64'
+else:
+ _libdir = 'lib'
+addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', _libdir, 'pkgconfig'))
+addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))
+
+addpath('XDG_DATA_DIRS', '/usr/share')
+addpath('XDG_CONFIG_DIRS', '/etc/xdg')
