Add b2g

6 files changed, 32 insertions, 6 deletions

diff --git a/config/modules/sugar.json b/config/modules/sugar.json
index 08a8141..7b8c903 100644
--- a/config/modules/sugar.json
+++ b/config/modules/sugar.json
@@ -35,8 +35,9 @@
         "repo": "git://git.sugarlabs.org/gst-plugins-espeak/mainline.git"
     }, 
     {
-        "name": "sugar-html-browser", 
-        "repo": "git://git.sugarlabs.org/sugar-html-browser/sugar-html-browser.git"
+        "name": "sugar-html", 
+        "out-of-source": false,
+        "repo": "git://git.sugarlabs.org/sugar-html/sugar-html.git"
     }, 
     {
         "name": "sugar-html-activity", 
diff --git a/config/modules/system.json b/config/modules/system.json
index 4a57b7c..42caff4 100644
--- a/config/modules/system.json
+++ b/config/modules/system.json
@@ -120,5 +120,10 @@
         "name": "metacity", 
         "repo": "git://git.gnome.org/metacity", 
         "tag": "METACITY_2_34_13"
+    }, 
+    {
+        "name": "b2g",
+        "out-of-source": false, 
+        "repo": "git://github.com/mozilla/mozilla-central.git"
     }
 ]
diff --git a/devbot/build.py b/devbot/build.py
index 694c478..d4ed2b6 100644
--- a/devbot/build.py
+++ b/devbot/build.py
@@ -133,10 +133,8 @@ def _build_autotools(module, log):
     aclocal_path = os.path.join(config.share_dir, "aclocal")
     utils.ensure_dir(aclocal_path)
 
-    makefile_path = os.path.join(module.get_build_dir(), "Makefile")
-
     source_dir = module.get_source_dir()
-    if not os.path.exists(makefile_path):
+    if not os.path.exists("Makefile"):
         configure = os.path.join(source_dir, "autogen.sh")
         if not os.path.exists(configure):
             configure = os.path.join(source_dir, "configure")
@@ -180,6 +178,19 @@ def _build_node(module, log):
 
 _builders["node"] = _build_node
 
+def _build_mozilla(module, log):
+    obj_dir = "obj-%s" % module.name
+    dist_bin_dir = os.path.join(obj_dir, "dist", "bin")
+    install_dir = os.path.join(config.lib_dir, module.name)
+
+    with open("mozconfig", "w") as f:
+        f.write("ac_add_options --enable-application=%s\n" % module.name)
+        f.write("mk_add_options MOZ_OBJDIR=%s" % obj_dir)
+
+    #command.run(["make", "-f", "client.mk"], log)
+    command.run(["cp", "-vRL", "%s/" % dist_bin_dir, install_dir], log)
+
+_builders["mozilla"] = _build_mozilla
 
 def _distribute_autotools(module):
     makefile = parse_makefile("Makefile")
diff --git a/devbot/config.py b/devbot/config.py
index 3f65417..be1809b 100644
--- a/devbot/config.py
+++ b/devbot/config.py
@@ -54,8 +54,11 @@ 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, "mozilla-config.h.in")):
+            return "mozilla"
         elif os.path.exists(os.path.join(source_dir, "autogen.sh")) or \
-                os.path.exists(os.path.join(source_dir, "configure")):
+                os.path.exists(os.path.join(source_dir, "configure")) or \
+                os.path.exists(os.path.join(source_dir, "Makefile")):
             return "autotools"
         elif os.path.exists(os.path.join(source_dir, "package.json")):
             return "node"
diff --git a/devbot/environ.py b/devbot/environ.py
index a9643de..cde6305 100644
--- a/devbot/environ.py
+++ b/devbot/environ.py
@@ -23,6 +23,8 @@ def setup_variables():
     add_path("LD_LIBRARY_PATH", config.lib_dir)
     add_path("PATH", config.bin_dir)
 
+    add_path("B2G_PATH",
+             os.path.join(config.lib_dir, "b2g"))
     add_path("XCURSOR_PATH",
              os.path.join(config.share_dir, "icons"))
     add_path("PKG_CONFIG_PATH",
diff --git a/devbot/state.py b/devbot/state.py
index 0a6f7b9..6bf7139 100644
--- a/devbot/state.py
+++ b/devbot/state.py
@@ -103,6 +103,10 @@ def _save_state(name, state):
 
 
 def _compute_mtime_hash(path):
+    # Too slow to compute the hash
+    if path.endswith("source/b2g"):
+        return "unchanged"
+
     # For some reason if path is unicode we
     # get a 10x slow down for some directories
     path = str(path)