[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Peter Foley]

 config_host.mk.in             |    1 +
 configure.ac                  |    5 +++++
 solenv/gbuild/JavaClassSet.mk |    3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit b97cade9183d14ad21ae71892348a9a81689488b
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sun Apr 7 12:14:36 2013 -0400

    Supress warnings about unset classpath
    
    I get the below warning for every single jar file without this patch.
    warning: [options] bootstrap class path not set in conjunction with
    -source 1.5
    1 warning
    
    Change-Id: I71c01aeea993640f1ec86fe1d8a977656861358d

diff --git a/config_host.mk.in b/config_host.mk.in
index 66a5c68..772e5d4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -257,6 +257,7 @@ export JAVACOMPILER=@JAVACOMPILER@
 export JAVADOC=@JAVADOC@
 export JAVADOCISGJDOC=@JAVADOCISGJDOC@
 export JAVAIFLAGS=@JAVAIFLAGS@
+export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
 @x_JAVALIB@ export JAVALIB=@JAVALIB@
 export JAVA_HOME=@JAVA_HOME@
diff --git a/configure.ac b/configure.ac
index 912c111..cdda016 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6068,6 +6068,10 @@ you must use the "--with-jdk-home" configure option explicitly])
             if test "$_jdk_ver" -lt 10500; then
                 AC_MSG_ERROR([JDK is too old, you need at least 1.5])
             fi
+            if test "$_jdk_ver" -gt 10600; then
+                JAVA_CLASSPATH_NOT_SET="1"
+            fi
+
             AC_MSG_RESULT([checked (JDK $_jdk)])
             JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
             if test "$_os" = "WINNT"; then
@@ -6613,6 +6617,7 @@ AC_SUBST(JAVACOMPILER)
 AC_SUBST(JAVADOC)
 AC_SUBST(JAVAINTERPRETER)
 AC_SUBST(JAVAIFLAGS)
+AC_SUBST(JAVA_CLASSPATH_NOT_SET)
 AC_SUBST(JAVA_HOME)
 AC_SUBST(JAVA_SOURCE_VER)
 AC_SUBST(JAVA_TARGET_VER)
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 7dd586a..a3e6477 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -27,7 +27,8 @@
 #*************************************************************************
 
 gb_JavaClassSet_JAVACCOMMAND := $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVAFLAGS) \
-    -source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
+    -source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER) \
+    $(if $(JAVA_CLASSPATH_NOT_SET),-Xlint:-options)
 gb_JavaClassSet_JAVACDEBUG :=
 
 # Enforces correct dependency order for possibly generated stuff: