From 4b16d90d3b6777e3ecdb7bd38a03d105579a835c Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Mon, 28 Apr 2014 14:53:00 -0400
Subject: [PATCH] Bug 961745 - Introduce b2g/dev application to build a mulet.
 r=mshal, r=fabrice

---
 b2g/dev/app.mozbuild                          | 25 +++++++++++++++++++
 b2g/dev/build.mk                              |  6 +++++
 b2g/dev/confvars.sh                           |  9 +++++++
 browser/app/Makefile.in                       |  3 +++
 browser/components/BrowserComponents.manifest |  2 ++
 configure.in                                  |  5 ++++
 6 files changed, 50 insertions(+)
 create mode 100644 b2g/dev/app.mozbuild
 create mode 100644 b2g/dev/build.mk
 create mode 100644 b2g/dev/confvars.sh

diff --git a/b2g/dev/app.mozbuild b/b2g/dev/app.mozbuild
new file mode 100644
index 0000000000000..cedbd2f43d551
--- /dev/null
+++ b/b2g/dev/app.mozbuild
@@ -0,0 +1,25 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+if not CONFIG['LIBXUL_SDK']:
+    app_libxul_dirs = []
+    app_libxul_static_dirs = []
+    include('/toolkit/toolkit.mozbuild')
+
+if CONFIG['MOZ_EXTENSIONS']:
+    add_tier_dir('app', 'extensions')
+
+add_tier_dir('app', [CONFIG['MOZ_BRANDING_DIRECTORY']])
+
+if CONFIG['MOZ_WEBAPP_RUNTIME']:
+    add_tier_dir('app', 'webapprt')
+
+add_tier_dir('app', 'b2g/chrome')
+add_tier_dir('app', 'b2g/components')
+
+# Never add tier dirs after browser because they apparently won't get
+# packaged properly on Mac.
+add_tier_dir('app', 'browser')
+
diff --git a/b2g/dev/build.mk b/b2g/dev/build.mk
new file mode 100644
index 0000000000000..daa4e7ac27ade
--- /dev/null
+++ b/b2g/dev/build.mk
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+include $(topsrcdir)/browser/build.mk
+
diff --git a/b2g/dev/confvars.sh b/b2g/dev/confvars.sh
new file mode 100644
index 0000000000000..93bdf8315b764
--- /dev/null
+++ b/b2g/dev/confvars.sh
@@ -0,0 +1,9 @@
+#! /bin/sh
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MOZ_B2G=1
+MOZ_MULET=1
+
+. ${srcdir}/browser/confvars.sh
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index f69dc7f3587b0..ac236888f52a1 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -7,6 +7,9 @@ dist_dest   = $(DIST)/$(MOZ_MACBUNDLE_NAME)
 PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
 		  $(NULL)
 
+ifdef MOZ_MULET
+PREF_JS_EXPORTS += $(topsrcdir)/b2g/app/b2g.js
+endif
 
 # hardcode en-US for the moment
 AB_CD = en-US
diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest
index 4a2b3fd0fccb6..dff31a0635dd4 100644
--- a/browser/components/BrowserComponents.manifest
+++ b/browser/components/BrowserComponents.manifest
@@ -42,4 +42,6 @@ component {eab9012e-5f74-4cbc-b2b5-a590235513cc} nsBrowserGlue.js
 contract @mozilla.org/browser/browserglue;1 {eab9012e-5f74-4cbc-b2b5-a590235513cc}
 category app-startup nsBrowserGlue service,@mozilla.org/browser/browserglue;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
 component {d8903bf6-68d5-4e97-bcd1-e4d3012f721a} nsBrowserGlue.js
+#ifndef MOZ_MULET
 contract @mozilla.org/content-permission/prompt;1 {d8903bf6-68d5-4e97-bcd1-e4d3012f721a}
+#endif
diff --git a/configure.in b/configure.in
index 06878690d3cc8..d9211c14dc8f1 100644
--- a/configure.in
+++ b/configure.in
@@ -4202,12 +4202,17 @@ xulrunner)
 b2g)
   AC_DEFINE(MOZ_B2G)
   ;;
+b2g/dev)
+  AC_DEFINE(MOZ_B2G)
+  AC_DEFINE(MOZ_MULET)
+  ;;
 esac
 
 AC_SUBST(MOZ_BUILD_APP)
 AC_SUBST(MOZ_PHOENIX)
 AC_SUBST(MOZ_XULRUNNER)
 AC_SUBST(MOZ_B2G)
+AC_SUBST(MOZ_MULET)
 AC_SUBST(MOZ_B2G_VERSION)
 
 AC_DEFINE_UNQUOTED(MOZ_BUILD_APP,$MOZ_BUILD_APP)