Bug 1336202 - Install the test updater during artifact builds. r=mshal draft
authorChris Manchester <cmanchester@mozilla.com>
Tue, 07 Feb 2017 16:25:58 -0800
changeset 480231 12ea27b6317810ff91102d7b790dc8f0750badb8
parent 480230 8554e33cb38173b53bc3a31552245581f8a3dde0
child 544901 7c32e4d0619191073d12a9d67ae3f950dd8d4a8c
push id44490
push usercmanchester@mozilla.com
push dateWed, 08 Feb 2017 00:26:48 +0000
reviewersmshal
bugs1336202
milestone54.0a1
Bug 1336202 - Install the test updater during artifact builds. r=mshal Now that we have the test updater in the test package thanks to FINAL_TARGET, we can install the test updater as usual during artifact builds. MozReview-Commit-ID: GhPeFQOzrVA
toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in
--- a/toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in
+++ b/toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in
@@ -13,17 +13,16 @@ include $(topsrcdir)/config/rules.mk
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG
 MOZ_WINCONSOLE = 1
 else
 MOZ_WINCONSOLE = 0
 endif
 endif
 
-ifdef COMPILE_ENVIRONMENT
 tools::
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	# Copy for xpcshell tests
 	$(NSINSTALL) -D $(XPCSHELLTESTROOT)/data/updater-xpcshell.app
 	rsync -a -C --exclude '*.in' $(srcdir)/../macbuild/Contents $(XPCSHELLTESTROOT)/data/updater-xpcshell.app
 	sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/../macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \
 	  iconv -f UTF-8 -t UTF-16 > $(XPCSHELLTESTROOT)/data/updater-xpcshell.app/Contents/Resources/English.lproj/InfoPlist.strings
 	$(NSINSTALL) -D $(XPCSHELLTESTROOT)/data/updater-xpcshell.app/Contents/MacOS
@@ -33,9 +32,8 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	mv $(XPCSHELLTESTROOT)/data/updater.app/Contents/MacOS/updater-xpcshell $(XPCSHELLTESTROOT)/data/updater.app/Contents/MacOS/org.mozilla.updater
 
 	# Copy for mochitest chrome tests
 	rsync -a -C $(XPCSHELLTESTROOT)/data/updater.app $(MOCHITESTROOT)/data/
 else
 	cp $(FINAL_TARGET)/updater-xpcshell$(BIN_SUFFIX) $(XPCSHELLTESTROOT)/data/updater$(BIN_SUFFIX)
 	cp $(FINAL_TARGET)/updater-xpcshell$(BIN_SUFFIX) $(MOCHITESTROOT)/data/updater$(BIN_SUFFIX)
 endif
-endif # COMPILE_ENVIRONMENT