Bug 557201 - switch Fennec builds to not build xulrunner first [r=mfinkle]
authorAki Sasaki <aki@mozilla.com>
Wed, 28 Apr 2010 10:27:59 -0400
changeset 66180 c9c9dba79ef23e8e237a702e6b28717f0dd702c5
parent 66179 8ba0a12654483aecc434ff55895e18205365f524
child 66181 e895ff3ca42fb7386e7b24360ba7080f03f14083
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs557201
Bug 557201 - switch Fennec builds to not build xulrunner first [r=mfinkle]
mobile/locales/Makefile.in
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -158,20 +158,28 @@ libs:: $(SETUP_INI)
 	cat $< | \
 	  sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \
 	  $(FINAL_TARGET)/setup.ini
 endif
 
 # When we unpack fennec on MacOS X the platform.ini and application.ini are in slightly
 # different locations that on all other platforms
 ifeq (Darwin, $(OS_ARCH))
+ifdef LIBXUL_SDK
 GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/../Frameworks/XUL.framework/Versions/$(MOZILLA_VERSION)/platform.ini"
+else
+GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/../Resources/platform.ini"
+endif
 FENNEC_APPLICATION_INI_PATH="$(STAGEDIST)/../Resources/application.ini"
 else
+ifdef LIBXUL_SDK
+GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/xulrunner/platform.ini"
+else
 GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/platform.ini"
+endif
 FENNEC_APPLICATION_INI_PATH="$(STAGEDIST)/application.ini"
 endif
 
 ident:
 	@printf "gecko_revision "
 	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(GECKO_PLATFORM_INI_PATH) Build SourceStamp
 	@printf "fennec_revision "
 	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(FENNEC_APPLICATION_INI_PATH) App SourceStamp