Ronald Klop
d33ede1043
Dependency openoffice needs java 8. Without this patch openoffice fails with: bad class file: /usr/local/share/java/classes/commons-httpclient.jar(org/apache/commons/httpclient/HttpClient.class) class file has wrong version 65.0, should be 52.0 Please remove or make sure it appears in the correct subdirectory of the classpath. So make httpclient target java 8 for now. While here I added encoding= to javac instead of the REINPLACE_CMD statement. PR: 293317 Approved-by: Alex Dupre (maintainer)
47 lines
1.8 KiB
XML
47 lines
1.8 KiB
XML
--- build.xml.orig 2007-08-18 09:02:14 UTC
|
|
+++ build.xml
|
|
@@ -179,24 +179,33 @@ -->
|
|
description="Compile shareable components">
|
|
<javac srcdir ="${source.home}/java"
|
|
destdir ="${build.home}/classes"
|
|
+ encoding ="ISO-8859-1"
|
|
+ source ="8"
|
|
+ target ="8"
|
|
debug ="${compile.debug}"
|
|
deprecation ="${compile.deprecation}"
|
|
optimize ="${compile.optimize}">
|
|
<classpath refid="compile.classpath"/>
|
|
</javac>
|
|
- <javac srcdir ="${source.home}/examples"
|
|
+ <!--javac srcdir ="${source.home}/examples"
|
|
destdir ="${build.home}/examples"
|
|
+ encoding ="ISO-8859-1"
|
|
+ source ="8"
|
|
+ target ="8"
|
|
debug ="${compile.debug}"
|
|
deprecation ="${compile.deprecation}"
|
|
optimize ="${compile.optimize}">
|
|
<classpath refid="compile.classpath"/>
|
|
- </javac>
|
|
+ </javac-->
|
|
</target>
|
|
|
|
<target name="compile.tests" depends="compile"
|
|
description="Compile unit test cases">
|
|
<javac srcdir ="${test.home}"
|
|
destdir ="${build.home}/tests"
|
|
+ encoding ="ISO-8859-1"
|
|
+ source ="8"
|
|
+ target ="8"
|
|
debug ="${compile.debug}"
|
|
deprecation ="${compile.deprecation}"
|
|
optimize ="${compile.optimize}">
|
|
@@ -248,6 +257,7 @@ -->
|
|
doctitle ="<h1>${component.title}</h1>"
|
|
windowtitle ="${component.title} (Version ${component.version})"
|
|
bottom ="Copyright (c) 1999-2005 - Apache Software Foundation"
|
|
+ encoding ="ISO-8859-1"
|
|
>
|
|
<classpath refid="test.classpath"/>
|
|
<link href="${javadoc.j2sdk.link}"/>
|