Add webkit

3 files changed, 29 insertions, 8 deletions

diff --git a/config/modules/system.json b/config/modules/system.json
index c19a838..46d843a 100644
--- a/config/modules/system.json
+++ b/config/modules/system.json
@@ -15,28 +15,24 @@
         "repo": "git://github.com/dnarvaez/gnome-keyring.git"
     }, 
     {
-        "if": "gnome_version == '3.4' or distro == 'ubuntu-12.10'", 
         "name": "glib", 
         "options": [
             "--disable-modular-tests"
         ], 
         "repo": "git://git.gnome.org/glib", 
-        "tag": "2.34.3"
+        "tag": "2.36.1"
     }, 
     {
-        "if": "gnome_version == '3.4' or distro == 'ubuntu-12.10'", 
         "name": "gobject-introspection", 
         "options": [
             "--disable-tests"
         ], 
         "repo": "git://git.gnome.org/gobject-introspection", 
-        "tag": "GOBJECT_INTROSPECTION_1_34_2"
+        "tag": "GOBJECT_INTROSPECTION_1_36_0"
     }, 
     {
-        "if": "gnome_version == '3.4' or distro == 'ubuntu-12.10'", 
         "name": "pygobject", 
-        "repo": "git://github.com/dnarvaez/pygobject.git", 
-        "branch": "sugar-build-3-4"
+        "repo": "git://git.gnome.org/pygobject"
     }, 
     {
         "if": "distro == 'debian-7.0'", 
@@ -119,5 +115,27 @@
         ], 
         "repo": "git://git.gnome.org/metacity", 
         "tag": "METACITY_2_34_13"
+    }, 
+    {
+        "if": "gnome_version == '3.4'", 
+        "name": "libsoup", 
+        "repo": "git://git.gnome.org/libsoup", 
+        "tag": "2.42.1"
+    }, 
+    {
+        "if": "gnome_version == '3.4'", 
+        "name": "libsecret", 
+        "repo": "git://git.gnome.org/libsecret", 
+        "tag": "0.15"
+    }, 
+    {
+        "if": "gnome_version == '3.4'", 
+        "name": "harfbuzz", 
+        "repo": "git://anongit.freedesktop.org/harfbuzz", 
+        "tag": "0.9.16"
+    }, 
+    {
+        "name": "webkitgtk", 
+        "repo": "git://github.com/dnarvaez/webkitgtk"
     }
 ]
diff --git a/devbot/build.py b/devbot/build.py
index 211cc88..65a317d 100644
--- a/devbot/build.py
+++ b/devbot/build.py
@@ -137,6 +137,8 @@ def _build_autotools(module, log):
 
     if not os.path.exists(makefile_path):
         configure = os.path.join(module.get_source_dir(), "autogen.sh")
+        if not os.path.exists(configure):
+            configure = os.path.join(module.get_source_dir(), "configure")
 
         args = [configure,
                 "--prefix", config.prefix_dir,
diff --git a/devbot/config.py b/devbot/config.py
index d444869..d27a0cf 100644
--- a/devbot/config.py
+++ b/devbot/config.py
@@ -52,7 +52,8 @@ class Module:
         source_dir = self.get_source_dir()
         if os.path.exists(os.path.join(source_dir, "setup.py")):
             return "activity"
-        elif os.path.exists(os.path.join(source_dir, "autogen.sh")):
+        elif os.path.exists(os.path.join(source_dir, "autogen.sh")) or \
+             os.path.exists(os.path.join(source_dir, "configure")):
             return "autotools"
         else:
             print("The source directory has unexpected content, please "