|
 |
6f0ba33 |
--- build.xml.java1.5 2011-10-24 22:10:29.000000000 +0100
|
|
|
6f0ba33 |
+++ build.xml 2016-09-15 14:52:27.047032691 +0100
|
|
 |
5a127a2 |
@@ -17,14 +17,14 @@
|
|
|
5a127a2 |
</target>
|
|
|
5a127a2 |
|
|
|
5a127a2 |
<target name="compile" description="Compile everything">
|
|
|
5a127a2 |
- <javac destdir="${build_dir}" debug="true" target="1.4" source="1.4">
|
|
|
5a127a2 |
+ <javac destdir="${build_dir}" debug="true" target="1.5" source="1.4">
|
|
|
5a127a2 |
<src path="${src_dir}"/>
|
|
|
5a127a2 |
<exclude name="tests/**"/>
|
|
|
5a127a2 |
</javac>
|
|
|
5a127a2 |
</target>
|
|
|
5a127a2 |
|
|
|
5a127a2 |
<target name="spi" description="Compile the Name Service Provider code">
|
|
|
5a127a2 |
- <javac destdir="${build_dir}" debug="true" target="1.4" source="1.4">
|
|
|
5a127a2 |
+ <javac destdir="${build_dir}" debug="true" target="1.5" source="1.4">
|
|
|
5a127a2 |
<src path="${src_dir}"/>
|
|
|
5a127a2 |
<include name="org/xbill/DNS/spi/*.java"/>
|
|
|
5a127a2 |
</javac>
|
|
|
6f0ba33 |
@@ -35,6 +35,7 @@
|
|
|
6f0ba33 |
basedir="${build_dir}" includes="**/*.class **/*.properties">
|
|
|
6f0ba33 |
<exclude name="org/xbill/DNS/tests/*.class"/>
|
|
|
6f0ba33 |
<exclude name="tests/**"/>
|
|
|
6f0ba33 |
+ <exclude name="*.class"/>
|
|
|
6f0ba33 |
<manifest>
|
|
|
6f0ba33 |
<attribute name="Implementation-Title" value="dnsjava"/>
|
|
|
6f0ba33 |
<attribute name="Implementation-Version" value="${version}"/>
|
|
|
6f0ba33 |
@@ -46,21 +47,18 @@
|
|
|
6f0ba33 |
</target>
|
|
|
6f0ba33 |
|
|
|
6f0ba33 |
<target name="bundle" description="Creates an OSGi bundle" depends="jar">
|
|
|
6f0ba33 |
-
|
|
|
6f0ba33 |
- dest="${build_dir}/bnd.jar"/>
|
|
|
6f0ba33 |
-
|
|
|
6f0ba33 |
- classpath="${build_dir}/bnd.jar"/>
|
|
|
6f0ba33 |
+ <taskdef resource="aQute/bnd/ant/taskdef.properties"/>
|
|
|
6f0ba33 |
<echo file="${dist_dir}/dnsjava-${version}.bnd" append="false">
|
|
|
6f0ba33 |
Bundle-Version: ${version}
|
|
|
6f0ba33 |
Bundle-Name: dnsjava is an implementation of DNS in Java
|
|
|
6f0ba33 |
Bundle-SymbolicName: org.xbill.dns
|
|
|
6f0ba33 |
Export-Package: org.xbill.DNS;version=${version},org.xbill.DNS.spi;version=${version},org.xbill.DNS.utils;version=${version},org.xbill.DNS.windows;version=${version}
|
|
|
6f0ba33 |
Bundle-Vendor: dnsjava.org
|
|
|
6f0ba33 |
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
|
|
|
6f0ba33 |
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
|
|
6f0ba33 |
Import-Package: !org.xbill.DNS*,!sun.*,*
|
|
|
6f0ba33 |
</echo>
|
|
|
6f0ba33 |
|
|
|
6f0ba33 |
- definitions="${dist_dir}"
|
|
|
6f0ba33 |
+ definitions="${dist_dir}/dnsjava-${version}.bnd"
|
|
|
6f0ba33 |
jars="${dist_dir}/${jarname}"
|
|
|
6f0ba33 |
output="${dist_dir}/org.xbill.dns_${version}.jar"/>
|
|
|
6f0ba33 |
<delete file="${dist_dir}/dnsjava-${version}.bnd"/>
|
|
|
6f0ba33 |
@@ -77,7 +75,7 @@
|
|
|
6f0ba33 |
|
|
|
6f0ba33 |
sourcepath="${src_dir}"
|
|
|
6f0ba33 |
packagenames="org.xbill.DNS,org.xbill.DNS.utils,org.xbill.DNS.spi"
|
|
|
6f0ba33 |
- windowtitle="dnsjava documentation">
|
|
|
6f0ba33 |
+ windowtitle="dnsjava documentation" additionalparam="-Xdoclint:none">
|
|
|
6f0ba33 |
|
|
|
6f0ba33 |
<link href="${j2se.javadoc}"/>
|
|
|
6f0ba33 |
</javadoc>
|
|
|
6f0ba33 |
@@ -107,7 +105,7 @@
|
|
|
5a127a2 |
</target>
|
|
|
5a127a2 |
|
|
|
5a127a2 |
<target name="compile_tests" depends="compile">
|
|
|
5a127a2 |
- <javac destdir="${tests_dir}" debug="true" target="1.4" source="1.4">
|
|
|
5a127a2 |
+ <javac destdir="${tests_dir}" debug="true" target="1.5" source="1.4">
|
|
|
5a127a2 |
<src path="${tests_dir}"/>
|
|
|
5a127a2 |
</javac>
|
|
|
5a127a2 |
</target>
|