This commit is contained in:
parent
7cb2568d78
commit
9815a904bf
@ -83,10 +83,25 @@
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Compilation target -->
|
||||
<!-- Java 9 compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile9" depends="compile" description="Compile the java9 code">
|
||||
<condition property="isJava9">
|
||||
<not>
|
||||
<or>
|
||||
<equals arg1="${ant.java.version}" arg2="1.1"/>
|
||||
<equals arg1="${ant.java.version}" arg2="1.2"/>
|
||||
<equals arg1="${ant.java.version}" arg2="1.3"/>
|
||||
<equals arg1="${ant.java.version}" arg2="1.4"/>
|
||||
<equals arg1="${ant.java.version}" arg2="1.5"/>
|
||||
<equals arg1="${ant.java.version}" arg2="1.6"/>
|
||||
<equals arg1="${ant.java.version}" arg2="1.7"/>
|
||||
<equals arg1="${ant.java.version}" arg2="1.8"/>
|
||||
</or>
|
||||
</not>
|
||||
</condition>
|
||||
|
||||
<target name="compile9" depends="compile" description="Compile the java9 code" if="isJava9">
|
||||
<mkdir dir="${build.outputDir9}"/>
|
||||
<javac destdir="${build.outputDir9}"
|
||||
nowarn="false"
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 2 13:22:51 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Put a condition to the compile9 target in order to allow building
|
||||
for distributions that do not have Java >= 9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 12 16:06:18 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
@ -32,7 +32,7 @@ Source100: plexus-java-build.xml
|
||||
BuildRequires: ant
|
||||
BuildRequires: atinject
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 9
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: objectweb-asm
|
||||
BuildRequires: plexus-containers-component-annotations
|
||||
|
Loading…
Reference in New Issue
Block a user