Bug 767839 Don't preprocess update-settings.ini twice r=khuey
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Tue, 03 Jul 2012 08:33:54 +0100
changeset 98156 d8a4ef92f06e08cebf9e40ecfd4e112803df0419
parent 98155 ce75fa1a043ea888d4170e311522252b69d79bde
child 98157 674cde7d007a5adb887578529255998fb6812c98
push id11388
push userneil@parkwaycc.co.uk
push dateTue, 03 Jul 2012 07:34:00 +0000
treeherdermozilla-inbound@d8a4ef92f06e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs767839
milestone16.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 767839 Don't preprocess update-settings.ini twice r=khuey
build/Makefile.in
build/update-settings.ini
build/update-settings.ini.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -127,24 +127,16 @@ GARBAGE_DIRS += $(_LEAKTEST_DIR)
 		$(topsrcdir)/build/pgo/blueprint/fancytype-screen.css \
 		$(NULL)
 
 leaktest.py: leaktest.py.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $^ > $@
 	chmod +x $@
 GARBAGE += leaktest.py
 
-ifneq (android,$(MOZ_WIDGET_TOOLKIT))
-ifdef MOZ_UPDATER
-update-settings.ini: update-settings.ini.in $(APP_INI_DEPS)
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $< > $@
-GARBAGE += update-settings.ini
-endif
-endif
-
 ifdef MOZ_APP_BASENAME
 application.ini: application.ini.in $(APP_INI_DEPS)
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $< > $@
 GARBAGE += application.ini
 
 ifdef MOZ_APP_STATIC_INI
 application.ini.h: appini_header.py application.ini 
 	$(PYTHON) $^ > $@
rename from build/update-settings.ini.in
rename to build/update-settings.ini