206 lines
7.5 KiB
Diff
206 lines
7.5 KiB
Diff
diff -Nru je-6.3.8/build.xml je-6.3.8.build/build.xml
|
|
--- je-6.3.8/build.xml 2015-05-09 06:58:09.000000000 +0200
|
|
+++ je-6.3.8.build/build.xml 2015-08-07 12:14:56.218830481 +0200
|
|
@@ -4,8 +4,7 @@
|
|
<!-- Ant Build File for Berkeley DB Java Edition -->
|
|
<!-- =========================================== -->
|
|
|
|
-<project name="JE" default="jar" basedir="."
|
|
- xmlns:ivy="antlib:org.apache.ivy.ant">
|
|
+<project name="JE" default="jar" basedir=".">
|
|
|
|
<description>Compile and test JE</description>
|
|
|
|
@@ -49,15 +48,15 @@
|
|
<property name="doclet.jar" value="${doc.dir}/HidingDoclet.jar"/>
|
|
|
|
<property name="java.apidoc"
|
|
- value="http://docs.oracle.com/javase/7/docs/api"/>
|
|
+ value="/usr/share/javadoc/java"/>
|
|
<property name="proxy.port" value="80"/>
|
|
<property name="javadoc.css" value="${docsrc.dir}/style.css"/>
|
|
|
|
<property name="jarfile" value="${libdir}/je.jar"/>
|
|
<property name="jcararfile" value="${libdir}/jejca.rar"/>
|
|
|
|
- <property name="junit.jarfile" value="${extlibdir}/junit-4.10.jar"/>
|
|
- <property name="hamcrest.jarfile" value="${extlibdir}/hamcrest-core-1.1.jar"/>
|
|
+ <property name="junit.jarfile" value="/usr/share/java/junit.jar"/>
|
|
+ <property name="hamcrest.jarfile" value="/usr/share/java/hamcrest/core.jar"/>
|
|
<property name="j2ee.jarfile" value="${extlibdir}/javaee-api-7.0.jar"/>
|
|
<property name="jconsole.jarfile" value="${extlibdir}/jconsole.jar"/>
|
|
|
|
@@ -251,18 +250,9 @@
|
|
</target>
|
|
|
|
<target name="compile-j2ee"
|
|
- depends="get-j2ee-jar,
|
|
- compile-jmx,
|
|
+ depends="compile-jmx,
|
|
compile-jca"/>
|
|
|
|
- <target name="get-junit-jar">
|
|
- <ivy:retrieve conf="junit"/>
|
|
- </target>
|
|
-
|
|
- <target name="get-j2ee-jar">
|
|
- <ivy:retrieve conf="j2ee"/>
|
|
- </target>
|
|
-
|
|
<target name="ivy-clean">
|
|
<delete includeemptydirs="true">
|
|
<fileset dir="${extlibdir}"/>
|
|
@@ -270,7 +260,6 @@
|
|
</target>
|
|
|
|
<target name="ivy-clean-cache">
|
|
- <ivy:cleancache />
|
|
</target>
|
|
|
|
<!--
|
|
@@ -299,7 +288,7 @@
|
|
doing a build, when using an IDE for example.
|
|
-->
|
|
<target name="extlib"
|
|
- depends="get-junit-jar, get-j2ee-jar, get-jconsole-jar"/>
|
|
+ depends="get-jconsole-jar"/>
|
|
|
|
<!-- ====== Internal (non-public) targets delegated to internal.xml =======
|
|
|
|
@@ -451,7 +440,7 @@
|
|
</ant>
|
|
</target>
|
|
|
|
- <target name="compile-jca" depends="get-j2ee-jar, compile-src">
|
|
+ <target name="compile-jca" depends="compile-src">
|
|
<ant antfile="ant/compile.xml" dir="." inheritall="false">
|
|
<reference refid="j2ee.classpath" torefid="compile.classpath"/>
|
|
<property name="include" value="com/sleepycat/je/jca/**/*.java"/>
|
|
@@ -716,9 +705,6 @@
|
|
</target>
|
|
|
|
<target name="require-jdk-version">
|
|
- <fail unless="running.jdk.version"
|
|
- message="Java ${jdk.version} is required for packaging, but
|
|
-current Java version is ${ant.java.version}"/>
|
|
</target>
|
|
|
|
<target name="release-jar" depends="require-jdk6,
|
|
@@ -874,7 +860,7 @@
|
|
<delete dir="${unittest.serialtest.txn}"/>
|
|
</target>
|
|
|
|
- <target name="compile-unittest" depends="compile-src, get-junit-jar">
|
|
+ <target name="compile-unittest" depends="compile-src">
|
|
<ant antfile="ant/compile.xml" dir="." inheritall="false">
|
|
<property name="srcdir" value="${unittest.srcdir}"/>
|
|
<property name="destdir" value="${unittest.destdir}"/>
|
|
@@ -1882,12 +1868,12 @@
|
|
|
|
<!-- Create an up to date property file for the build -->
|
|
<target name="update-version" depends="compile-src, compile-dist">
|
|
- <java fork="yes" jvm="${jvm}" failonerror="true"
|
|
+ <!--java fork="yes" jvm="${jvm}" failonerror="true"
|
|
classname="CreateRELEASEFile"
|
|
classpathref="dist.classpath">
|
|
<jvmarg line="${jvmargs}"/>
|
|
<arg value="${release.propertyfile}"/>
|
|
- </java>
|
|
+ </java-->
|
|
|
|
<!-- read it in -->
|
|
<property file="${release.propertyfile}"/>
|
|
@@ -1903,33 +1889,6 @@
|
|
<tstamp>
|
|
<format property="release.date" pattern="MMMMMMMM dd, yyyy"/>
|
|
</tstamp>
|
|
-
|
|
- <!-- Copy the main page, images and release notes, to the
|
|
- docs directory, putting in the release version where
|
|
- appropriate -->
|
|
- <copy overwrite="true" todir="${doc.dir}">
|
|
- <filterset>
|
|
- <filter token="RELEASE_VERSION" value="${release.version}"/>
|
|
- <filter token="RELEASE_NUMERIC_VERSION"
|
|
- value="${release.numeric.versionc.version}"/>
|
|
- <filter token="DATE" value="${release.date}"/>
|
|
- </filterset>
|
|
- <fileset dir="${docsrc.dir}">
|
|
- <include name="*.html"/>
|
|
- <include name="*.css"/>
|
|
- <exclude name="style.css"/>
|
|
- </fileset>
|
|
- </copy>
|
|
- <copy todir="${doc.dir}/images">
|
|
- <fileset dir="${docsrc.dir}/images"/>
|
|
- </copy>
|
|
- <copy todir="${doc.dir}/sleepycat">
|
|
- <fileset dir="${docsrc.dir}/sleepycat"/>
|
|
- </copy>
|
|
- <copy todir="${doc.dir}/jconsole">
|
|
- <fileset dir="${docsrc.dir}/jconsole"/>
|
|
- </copy>
|
|
-
|
|
<antcall target="javadoc-src"/>
|
|
<antcall target="javadoc-examples"/>
|
|
</target>
|
|
@@ -1943,7 +1902,7 @@
|
|
</target>
|
|
|
|
<target name="javadoc-src"
|
|
- depends="require-jdk-version, get-j2ee-jar, copy-doc-materials, jar-hidingdoclet">
|
|
+ depends="require-jdk-version, copy-doc-materials">
|
|
<delete dir="${doc.javadir}"/>
|
|
<mkdir dir="${doc.javadir}"/>
|
|
<!-- Run javadoc on public API -->
|
|
@@ -1956,13 +1915,12 @@
|
|
source="${jdk.version}"
|
|
use="true"
|
|
failonerror="true"
|
|
- docletpath="docs/HidingDoclet.jar"
|
|
- stylesheetfile="${javadoc.css}"
|
|
+ encoding="utf-8"
|
|
+ additionalparam="-Xdoclint:none"
|
|
windowtitle="Oracle - Berkeley DB Java Edition API">
|
|
<classpath refid="j2ee.classpath"/>
|
|
<classpath path="${ant.library.dir}/ant.jar"/>
|
|
<arg value="-author"/>
|
|
- <doclet name="HidingDoclet"/>
|
|
<group title="Berkeley DB Java Edition Packages">
|
|
<package name="com.sleepycat.je*"/>
|
|
<package name="com.sleepycat.je.util"/>
|
|
@@ -2016,11 +1974,6 @@
|
|
<arg value="-J-Dhttp.proxyHost=${proxy.host}"/>
|
|
<arg value="-J-Dhttp.proxyPort=${proxy.port}"/>
|
|
</javadoc>
|
|
- <!-- Copy the standard Java CSS style sheet -->
|
|
- <copy tofile="${doc.javadir}/standard-stylesheet.css">
|
|
- <javaresource
|
|
- name="com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css"/>
|
|
- </copy>
|
|
</target>
|
|
|
|
<target name="javadoc-examples" depends="copy-doc-materials">
|
|
@@ -2032,7 +1985,8 @@
|
|
nodeprecated="false"
|
|
access="public"
|
|
source="${jdk.version}"
|
|
- stylesheetfile="${javadoc.css}"
|
|
+ encoding="utf-8"
|
|
+ additionalparam="-Xdoclint:none"
|
|
windowtitle="Oracle - Berkeley DB Java Edition Examples">
|
|
<classpath refid="j2ee.classpath"/>
|
|
<header><![CDATA[<b>Berkeley DB Java Edition Examples</b><br><font size=\"-1\"> version ${release.version}</font>]]>
|
|
@@ -2051,11 +2005,6 @@
|
|
<arg value="-J-Dhttp.proxyHost=${proxy.host}"/>
|
|
<arg value="-J-Dhttp.proxyPort=${proxy.port}"/>
|
|
</javadoc>
|
|
- <!-- Copy the standard Java CSS style sheet -->
|
|
- <copy tofile="${doc.examplesdir}/standard-stylesheet.css">
|
|
- <javaresource
|
|
- name="com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css"/>
|
|
- </copy>
|
|
</target>
|
|
|
|
<!-- ============================================================ -->
|