Mercurial > hg > openjdk > icedtea > jdk7 > langtools

changeset 1288:26f5c80eb792

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR1095: Allow -Werror to be turned off.
author andrew
date Wed, 22 Aug 2012 16:39:30 +0100
parents b19919b8e86d
children 3ce5864ed9da
files make/Makefile make/build.properties
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/Makefile	Mon Aug 06 14:20:28 2012 +0100
+++ b/make/Makefile	Wed Aug 22 16:39:30 2012 +0100
@@ -111,6 +111,12 @@
   ANT_OPTIONS += -Ddebug.classfiles=true
 endif
 
+ifeq ($(JAVAC_WARNINGS_FATAL), true)
+  ANT_OPTIONS += -Dwarnings.fatal=-Werror
+else
+  ANT_OPTIONS += -Dwarnings.fatal=
+endif
+
 # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
 # and the somewhat misnamed CLASS_VERSION (-target NN)
 ifdef TARGET_CLASS_VERSION
--- a/make/build.properties	Mon Aug 06 14:20:28 2012 +0100
+++ b/make/build.properties	Wed Aug 22 16:39:30 2012 +0100
@@ -68,7 +68,7 @@
 # set the following to -version to verify the versions of javac being used
 javac.version.opt =
 # in time, there should be no exceptions to -Xlint:all
-javac.lint.opts = -Xlint:all,-deprecation -Werror
+javac.lint.opts = -Xlint:all,-deprecation ${warnings.fatal}
 
 # options for the <javadoc> task for javac
 #javadoc.jls3.url=http://java.sun.com/docs/books/jls/