Bug 920198 - Build simulator xpi and enable phone tweaks for b2g-desktop. r=aki,r=glandium, a=lsblakk
☠☠ backed out by 5bbac3fecc7e ☠ ☠
authorAlexandre Poirot <poirot.alex@gmail.com>
Tue, 08 Apr 2014 08:23:00 +0200
changeset 192989 3316ffe2a75af3795b7b756901fc66e17536784e
parent 192988 f9f60d47dbee751073494bb8fea1eea635832248
child 192990 68daba799a494f275f3de70dd2acbc3fd51c3dec
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki, glandium, lsblakk
bugs920198
milestone30.0a2
Bug 920198 - Build simulator xpi and enable phone tweaks for b2g-desktop. r=aki,r=glandium, a=lsblakk
b2g/build.mk
b2g/config/mozconfigs/linux32_gecko/nightly
b2g/config/mozconfigs/linux64_gecko/nightly
b2g/config/mozconfigs/macosx64_gecko/nightly
b2g/installer/Makefile.in
--- a/b2g/build.mk
+++ b/b2g/build.mk
@@ -4,19 +4,16 @@
 
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 installer: 
 	@$(MAKE) -C b2g/installer installer
 
 package:
 	@$(MAKE) -C b2g/installer
-ifdef FXOS_SIMULATOR
-	$(PYTHON) $(srcdir)/b2g/simulator/build_xpi.py $(MOZ_PKG_PLATFORM)
-endif
 
 install::
 	@echo 'B2G can't be installed directly.'
 	@exit 1
 
 upload::
 	@$(MAKE) -C b2g/installer upload
 
--- a/b2g/config/mozconfigs/linux32_gecko/nightly
+++ b/b2g/config/mozconfigs/linux32_gecko/nightly
@@ -27,9 +27,12 @@ export MOZ_TELEMETRY_REPORTING=1
 #B2G options
 ac_add_options --enable-application=b2g
 ENABLE_MARIONETTE=1
 ac_add_options --disable-elf-hack
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
 
+# Build simulator xpi and phone tweaks for b2g-desktop
+FXOS_SIMULATOR=1
+
 . "$topsrcdir/b2g/config/mozconfigs/common.override"
--- a/b2g/config/mozconfigs/linux64_gecko/nightly
+++ b/b2g/config/mozconfigs/linux64_gecko/nightly
@@ -27,9 +27,12 @@ export MOZ_TELEMETRY_REPORTING=1
 #B2G options
 ac_add_options --enable-application=b2g
 ENABLE_MARIONETTE=1
 ac_add_options --disable-elf-hack
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
 
+# Build simulator xpi and phone tweaks for b2g-desktop
+FXOS_SIMULATOR=1
+
 . "$topsrcdir/b2g/config/mozconfigs/common.override"
--- a/b2g/config/mozconfigs/macosx64_gecko/nightly
+++ b/b2g/config/mozconfigs/macosx64_gecko/nightly
@@ -22,9 +22,12 @@ ac_add_options --enable-application=b2g
 ac_add_options --enable-debug-symbols
 . "$topsrcdir/build/mozconfig.cache"
 ENABLE_MARIONETTE=1
 
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
 
+# Build simulator xpi and phone tweaks for b2g-desktop
+FXOS_SIMULATOR=1
+
 . "$topsrcdir/b2g/config/mozconfigs/common.override"
--- a/b2g/installer/Makefile.in
+++ b/b2g/installer/Makefile.in
@@ -67,8 +67,20 @@ ifdef MOZ_CHROME_MULTILOCALE
 	do \
 	  printf '$(BINPATH)/chrome/'"$$LOCALE"'$(JAREXT)\n' >> $@; \
 	  printf '$(BINPATH)/chrome/'"$$LOCALE"'.manifest\n' >> $@; \
 	done
 endif
 
 GARBAGE += $(MOZ_PKG_MANIFEST)
 endif
+
+ifdef FXOS_SIMULATOR
+.PHONY: simulator
+simulator: make-package
+	@echo 'Building simulator addon...'
+	$(PYTHON) $(topsrcdir)/b2g/simulator/build_xpi.py $(MOZ_PKG_PLATFORM)
+
+default:: simulator
+
+# Ensure copying Simulator xpi to ftp
+UPLOAD_EXTRA_FILES += fxos-simulator-*-*.xpi
+endif