Bug 908142 - Part d: Move FAIL_ON_WARNINGS to moz.build in js/xpconnect/shell/; r=gps
authorMs2ger <ms2ger@gmail.com>
Sun, 20 Oct 2013 09:25:19 +0200
changeset 166188 88e3a46b2c80e2f281a3004605647dda748a4c14
parent 166187 a27418c31cd3d8cc65ef88d8362eaa3745914f30
child 166189 a9b08bb0f5fb8d6b3cc6f1a39adb22c4101c5ac4
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs908142
milestone27.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 908142 - Part d: Move FAIL_ON_WARNINGS to moz.build in js/xpconnect/shell/; r=gps
js/xpconnect/shell/Makefile.in
js/xpconnect/shell/moz.build
--- a/js/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@@ -1,14 +1,13 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-FAIL_ON_WARNINGS := 1
 SDK_BINARY	= $(PROGRAM)
 
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/toolkit/xre \
   $(NULL)
 
 LIBS		= \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
@@ -22,27 +21,26 @@ endif
 
 LIBS +=	$(NSPR_LIBS)
 
 NSDISTMODE = copy
 
 ifeq ($(OS_TEST),ia64)
 LIBS += $(JEMALLOC_LIBS)
 endif
-include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
+include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
 
-include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
 DEFINES		+= -DJS_THREADSAFE
 
 ifdef MOZ_SHARK
 DEFINES += -DMOZ_SHARK
 endif
 ifdef MOZ_CALLGRIND
 DEFINES += -DMOZ_CALLGRIND
 endif
--- a/js/xpconnect/shell/moz.build
+++ b/js/xpconnect/shell/moz.build
@@ -1,14 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+FAIL_ON_WARNINGS = True
+
 MODULE = 'xpcshell'
 
 PROGRAM = 'xpcshell'
 
 CPP_SOURCES += [
     'xpcshell.cpp',
 ]