Bug 920198 - Build simulator xpi and enable phone tweaks for b2g-desk…

…top r=aki,glandium
sean93park · Apr 8, 2014 · f0f375c · f0f375c
1 parent 4801145
commit f0f375c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/b2g/build.mk b/b2g/build.mk
@@ -9,9 +9,6 @@ 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.'

diff --git a/b2g/config/mozconfigs/linux32_gecko/nightly b/b2g/config/mozconfigs/linux32_gecko/nightly
@@ -31,4 +31,7 @@ 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"
diff --git a/b2g/config/mozconfigs/linux64_gecko/nightly b/b2g/config/mozconfigs/linux64_gecko/nightly
@@ -31,4 +31,7 @@ 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"
diff --git a/b2g/config/mozconfigs/macosx64_gecko/nightly b/b2g/config/mozconfigs/macosx64_gecko/nightly
@@ -25,4 +25,7 @@ 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"
diff --git a/b2g/installer/Makefile.in b/b2g/installer/Makefile.in
@@ -79,3 +79,15 @@ 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