openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1825849 - in /openoffice/trunk/main/lucene: lucene-java-version.patch makefile.mk
Date Mon, 05 Mar 2018 04:44:08 GMT
Author: damjan
Date: Mon Mar  5 04:44:08 2018
New Revision: 1825849

URL: http://svn.apache.org/viewvc?rev=1825849&view=rev
Log:
The -source and -target options passed to javac
must be at least 1.6, to support building with
Java 1.9.

Patch by: me


Added:
    openoffice/trunk/main/lucene/lucene-java-version.patch
Modified:
    openoffice/trunk/main/lucene/makefile.mk

Added: openoffice/trunk/main/lucene/lucene-java-version.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/lucene/lucene-java-version.patch?rev=1825849&view=auto
==============================================================================
--- openoffice/trunk/main/lucene/lucene-java-version.patch (added)
+++ openoffice/trunk/main/lucene/lucene-java-version.patch Mon Mar  5 04:44:08 2018
@@ -0,0 +1,39 @@
+--- misc/build/lucene-2.9.4/common-build.xml	2018-03-05 06:13:00.041924900 +0200
++++ misc/build/lucene-2.9.4/common-build.xml	2018-03-05 06:34:48.448742000 +0200
+@@ -58,8 +58,8 @@
+ 
+   <property name="javac.deprecation" value="off"/>
+   <property name="javac.debug" value="on"/>
+-  <property name="javac.source" value="1.4"/>
+-  <property name="javac.target" value="1.4"/>
++  <property name="javac.source" value="1.6"/>
++  <property name="javac.target" value="1.6"/>
+ 
+   <property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
+   <property name="javadoc.access" value="protected"/>
+--- misc/build/lucene-2.9.4/contrib/analyzers/common/build.xml	2010-11-28 02:22:13.000000000
+0200
++++ misc/build/lucene-2.9.4/contrib/analyzers/common/build.xml	2018-03-05 06:39:48.913151800
+0200
+@@ -23,8 +23,8 @@
+     Additional Analyzers
+   </description>
+ 
+-  <property name="javac.source" value="1.4" />
+-  <property name="javac.target" value="1.4" />
++  <property name="javac.source" value="1.6" />
++  <property name="javac.target" value="1.6" />
+ 	
+   <property name="build.dir" location="../../../build/contrib/analyzers/common" />
+   <property name="dist.dir" location="../../../dist/contrib/analyzers/common" />
+--- misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml	2010-11-28 02:22:11.000000000
+0200
++++ misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml	2018-03-05 06:41:07.207097100
+0200
+@@ -23,8 +23,8 @@
+     Smart Chinese Analyzer
+   </description>
+ 
+-  <property name="javac.source" value="1.4" />
+-  <property name="javac.target" value="1.4" />
++  <property name="javac.source" value="1.6" />
++  <property name="javac.target" value="1.6" />
+ 	
+   <property name="build.dir" location="../../../build/contrib/analyzers/smartcn" />
+   <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" />

Modified: openoffice/trunk/main/lucene/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/lucene/makefile.mk?rev=1825849&r1=1825848&r2=1825849&view=diff
==============================================================================
--- openoffice/trunk/main/lucene/makefile.mk (original)
+++ openoffice/trunk/main/lucene/makefile.mk Mon Mar  5 04:44:08 2018
@@ -62,6 +62,8 @@ PATCH_FILES=lucene.patch
 PATCH_FILES+= long_path.patch
 .ENDIF
 
+PATCH_FILES+=lucene-java-version.patch
+
 BUILD_DIR=.
 BUILD_ACTION= ${ANT} -buildfile .$/contrib$/analyzers$/build.xml
 



Mime
View raw message