Bug 1015949 - Ensure that make package when building b2g/dev ship all b2g files. r=fabrice
authorAlexandre Poirot <poirot.alex@gmail.com>
Mon, 26 May 2014 09:18:00 -0400
changeset 204501 8331da4219d87d9eb90cb54a7fad608c0e47562b
parent 204500 22b5eefc275433bff9f2030504a6c95e4df0a2cf
child 204502 450492b8afb866eeeb760b25e0bc7a3a5e611331
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice
bugs1015949
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1015949 - Ensure that make package when building b2g/dev ship all b2g files. r=fabrice
b2g/dev/app.mozbuild
b2g/dev/app/Makefile.in
b2g/installer/package-manifest.in
browser/app/Makefile.in
browser/installer/Makefile.in
--- a/b2g/dev/app.mozbuild
+++ b/b2g/dev/app.mozbuild
@@ -14,12 +14,14 @@ if CONFIG['MOZ_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')
 
+add_tier_dir('app', 'b2g/dev/app')
+
 # Never add tier dirs after browser because they apparently won't get
 # packaged properly on Mac.
 add_tier_dir('app', 'browser')
 
new file mode 100644
--- /dev/null
+++ b/b2g/dev/app/Makefile.in
@@ -0,0 +1,5 @@
+# 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/.
+
+PREF_JS_EXPORTS += $(topsrcdir)/b2g/app/b2g.js
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -622,17 +622,21 @@
 #ifndef XP_MACOSX
 @BINPATH@/icons/*.xpm
 @BINPATH@/icons/*.png
 #endif
 #endif
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
+#ifdef MOZ_MULET
+@BINPATH@/defaults/pref/b2g.js
+#else
 @BINPATH@/@PREF_DIR@/b2g.js
+#endif
 @BINPATH@/@PREF_DIR@/channel-prefs.js
 @BINPATH@/greprefs.js
 @BINPATH@/defaults/autoconfig/platform.js
 @BINPATH@/defaults/autoconfig/prefcalls.js
 @BINPATH@/defaults/profile/prefs.js
 
 ; Services (gre) prefs
 #ifdef MOZ_SERVICES_SYNC
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -2,20 +2,16 @@
 # 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/.
 
 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
 
 DEFINES += \
   -DAB_CD=$(AB_CD) \
   -DFIREFOX_ICO='"$(DIST)/branding/firefox.ico"' \
   -DDOCUMENT_ICO='"$(DIST)/branding/document.ico"' \
   -DNEWWINDOW_ICO='"$(DIST)/branding/newwindow.ico"' \
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -5,20 +5,27 @@
 STANDALONE_MAKEFILE := 1
 DIST_SUBDIR := browser
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+
+ifdef MOZ_MULET
+MOZ_PKG_MANIFEST_P += $(topsrcdir)/b2g/installer/package-manifest.in
+endif
+
 # Some files have been already bundled with xulrunner
 ifndef SYSTEM_LIBXUL
+ifndef MOZ_MULET
 MOZ_PKG_FATAL_WARNINGS = 1
 endif
+endif
 
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
 
 ifdef LIBXUL_SDK
 DEFINES += -DLIBXUL_SDK=1
 endif
 
 ifdef MOZ_DEBUG
@@ -83,17 +90,17 @@ endif
 ifdef GKMEDIAS_SHARED_LIBRARY
 DEFINES += -DGKMEDIAS_SHARED_LIBRARY
 endif
 
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = package-manifest
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
-	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $< -o $@)
+	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(MOZ_PKG_MANIFEST_P) -o $@)
 
 GARBAGE += $(MOZ_PKG_MANIFEST)
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_MAC_DSSTORE=branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=branding/background.png
 MOZ_PKG_MAC_ICON=branding/disk.icns