[Libreoffice-commits] core.git: configure.ac external/apache-commons external/jfreereport
Fridrich Å trba
fridrich.strba at bluewin.ch
Mon Oct 6 01:24:33 PDT 2014
configure.ac | 12 ++++++++-
external/apache-commons/patches/logging.patch | 29 ++++++++++++++++--------
external/jfreereport/patches/common_build.patch | 19 ++++++++++++++-
3 files changed, 48 insertions(+), 12 deletions(-)
New commits:
commit 0595f3ff18f1105ba7bea4a9599c071575ea703c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Mon Oct 6 10:20:53 2014 +0200
Allow building with java9 (first installement)
In java9, there is no option for source/target 1.5,
the lowest version is 1.6.
This commit also patches the relevant external libraries
in order to be able to build with build-wide source/target
Change-Id: I68807c973a2a8be2f9b3a6e01243e36cb7110a12
diff --git a/configure.ac b/configure.ac
index f14180a..6e17ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6614,6 +6614,7 @@ if test "$ENABLE_JAVA" != ""; then
fi
HAVE_JAVA6=
+HAVE_JAVA9=
dnl ===================================================================
dnl Checks for JDK.
dnl ===================================================================
@@ -6675,6 +6676,9 @@ you must use the "--with-jdk-home" configure option explicitly])
if test "$_jdk_ver" -ge 10600; then
HAVE_JAVA6=TRUE
fi
+ if test "$_jdk_ver" -ge 10900; then
+ HAVE_JAVA9=TRUE
+ fi
AC_MSG_RESULT([checked (JDK $_jdk)])
JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
@@ -6695,13 +6699,17 @@ else
JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
fi
AC_SUBST([HAVE_JAVA6])
+AC_SUBST([HAVE_JAVA9])
dnl ===================================================================
dnl Set target Java bytecode version
dnl ===================================================================
if test "$ENABLE_JAVA" != ""; then
- _java_target_ver="1.5"
-
+ if test "$HAVE_JAVA9" == "TRUE"; then
+ _java_target_ver="1.6"
+ else
+ _java_target_ver="1.5"
+ fi
JAVA_SOURCE_VER="$_java_target_ver"
JAVA_TARGET_VER="$_java_target_ver"
fi
diff --git a/external/apache-commons/patches/logging.patch b/external/apache-commons/patches/logging.patch
index 953cf61..c225e5a 100644
--- a/external/apache-commons/patches/logging.patch
+++ b/external/apache-commons/patches/logging.patch
@@ -1,19 +1,19 @@
--- misc/commons-logging-1.1.1-src/build.xml 2007-11-22 00:27:52.000000000 +0100
+++ misc/build/commons-logging-1.1.1-src/build.xml 2008-06-24 14:23:56.316301736 +0200
-@@ -130,10 +130,10 @@
+@@ -129,12 +129,6 @@
+
<!-- ========== Compiler Defaults ========================================= -->
- <!-- Version of java class files to generate. -->
+- <!-- Version of java class files to generate. -->
- <property name="target.version" value="1.2"/>
-+ <property name="target.version" value="1.5"/>
-
- <!-- Version of java source to accept -->
+-
+- <!-- Version of java source to accept -->
- <property name="source.version" value="1.2"/>
-+ <property name="source.version" value="1.3"/>
-
+-
<!-- Should Java compilations set the 'debug' compiler option? -->
<property name="compile.debug" value="true"/>
-@@ -283,6 +283,10 @@
+
+@@ -283,6 +277,10 @@
classpathref="compile.classpath"
classname="org.apache.avalon.framework.logger.Logger"/>
@@ -24,7 +24,18 @@
<available file="${log4j12.jar}" property="log4j12.present"/>
<available file="${log4j13.jar}" property="log4j13.present"/>
<available file="${build.home}/docs" property="maven.generated.docs.present"/>
-@@ -373,6 +377,8 @@
+@@ -362,8 +360,8 @@
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+- source="${source.version}"
+- target="${target.version}">
++ source="${ant.build.javac.source}"
++ target="${ant.build.javac.target}">
+
+ <classpath refid="compile.classpath"/>
+
+@@ -373,6 +371,8 @@
unless="logkit.present"/>
<exclude name="org/apache/commons/logging/impl/AvalonLogger.java"
unless="avalon-framework.present"/>
diff --git a/external/jfreereport/patches/common_build.patch b/external/jfreereport/patches/common_build.patch
index 2bc5459..b197f49 100644
--- a/external/jfreereport/patches/common_build.patch
+++ b/external/jfreereport/patches/common_build.patch
@@ -1,5 +1,14 @@
--- misc/libloader-1.1.3/common_build.xml 2009-11-16 10:25:34.000000000 +0100
+++ misc/build/libloader-1.1.3/common_build.xml 2009-12-04 10:22:24.277647200 +0100
+@@ -136,8 +136,6 @@
+ <property name="javac.deprecation"
+ value="true"
+ description="Indicates whether source should be compiled with deprecation information" />
+- <property name="javac.source" value="1.5" description="Provide source compatibility with specified release" />
+- <property name="javac.target" value="1.5" description="Generate class files for specific VM version" />
+
+ <!-- Build Cache properties -->
+ <property name="build.cache.dir"
@@ -261,7 +261,7 @@ TYPICAL TARGET SEQUENCE
<property name="project.revision" value="${Implementation-Version}" description="Sets the version number of the project based on the Implementation-Version found in the manifest file (if one is supplied and nothing is specified in the build.properties)" />
<fail message="A project revision number has not been determined!">
@@ -27,7 +36,7 @@
<if>
<istrue value="${release}" />
<then>
-@@ -1061,6 +1061,11 @@
+@@ -1061,12 +1061,17 @@
Performs the actual compile
====================================================================-->
<target name="compile.compile" depends="init">
@@ -39,6 +48,14 @@
<javac destdir="${classes.dir}"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
+ fork="true"
+- source="${javac.source}"
+- target="${javac.target}">
++ source="${ant.build.javac.source}"
++ target="${ant.build.javac.target}">
+ <classpath>
+ <path refid="classpath" />
+ </classpath>
@@ -1082,27 +1087,32 @@
duplicate copying of resources from src tree (handled by compile.src_copy
if jar.include.source is set.
More information about the Libreoffice-commits
mailing list