|
 |
575fe9 |
From 05a8a2fa49e92ad36a86d5d73588a2e46bf9ff95 Mon Sep 17 00:00:00 2001
|
|
|
575fe9 |
From: Michael Simacek <msimacek@redhat.com>
|
|
|
575fe9 |
Date: Mon, 23 Jul 2018 14:30:14 +0200
|
|
|
575fe9 |
Subject: [PATCH] Adapt build
|
|
|
575fe9 |
|
|
|
575fe9 |
---
|
|
|
575fe9 |
build.xml | 40 +++++++++++++++++++++++++---------------
|
|
|
575fe9 |
1 file changed, 25 insertions(+), 15 deletions(-)
|
|
|
575fe9 |
|
|
|
575fe9 |
diff --git a/build.xml b/build.xml
|
|
|
575fe9 |
index cd7c2ed..10d8df6 100644
|
|
|
575fe9 |
--- a/build.xml
|
|
|
575fe9 |
+++ b/build.xml
|
|
|
575fe9 |
@@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
|
|
575fe9 |
|
|
|
575fe9 |
|
|
|
575fe9 |
<path id="base.class.path">
|
|
|
575fe9 |
- <pathelement location="${jaxen.jar}" />
|
|
|
575fe9 |
- <pathelement location="${parser.jar}" />
|
|
|
575fe9 |
- <pathelement location="${xmlapi.jar}" />
|
|
|
575fe9 |
- <pathelement location="${junit.jar}" />
|
|
|
575fe9 |
- <pathelement location="${isorelax.jar}" />
|
|
|
575fe9 |
- <pathelement location="${xalan.jar}" />
|
|
|
575fe9 |
- <pathelement location="${xalanser.jar}" />
|
|
|
575fe9 |
-
|
|
|
575fe9 |
-
|
|
|
575fe9 |
- <pathelement location="${stax.dir}/jsr173_1.0_api.jar" />
|
|
|
575fe9 |
- <pathelement location="${stax.dir}/sjsxp.jar" />
|
|
|
575fe9 |
+ <fileset dir="${lib.dir}" includes="*.jar" />
|
|
|
575fe9 |
</path>
|
|
|
575fe9 |
|
|
|
575fe9 |
<path id="core.class.path">
|
|
|
575fe9 |
@@ -289,6 +279,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
|
|
575fe9 |
header="<b>${Name}<br><font size='-1'>${version}</font></b>"
|
|
|
575fe9 |
bottom="Copyright © ${year} Jason Hunter, Brett McLaughlin. All Rights Reserved.">
|
|
|
575fe9 |
<classpath refid="base.class.path"/>
|
|
|
575fe9 |
+ <link href="${j2se.apidoc}"/>
|
|
|
575fe9 |
</javadoc>
|
|
|
575fe9 |
</target>
|
|
|
575fe9 |
|
|
|
575fe9 |
@@ -373,11 +364,11 @@ For instructions on how to build JDOM, please view the README.txt file.
|
|
|
575fe9 |
|
|
|
575fe9 |
|
|
|
575fe9 |
description="Creates the class package">
|
|
|
575fe9 |
- <zip destfile="${package}/${jarbase}.zip">
|
|
|
575fe9 |
+
|
|
|
575fe9 |
<fileset dir="${package}" includes="${jarbase}*.jar" />
|
|
|
575fe9 |
<fileset dir="${basedir}" includes="lib/xerces* lib/jaxen* lib/xml* lib/xalan/**" />
|
|
|
575fe9 |
<fileset dir="${basedir}" includes="LICENSE.txt README.txt" />
|
|
|
575fe9 |
- </zip>
|
|
|
575fe9 |
+ </zip>-->
|
|
|
575fe9 |
</target>
|
|
|
575fe9 |
|
|
|
575fe9 |
|
|
|
575fe9 |
@@ -401,6 +392,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
|
|
575fe9 |
<include name="**/*.class"/>
|
|
|
575fe9 |
|
|
|
575fe9 |
</fileset>
|
|
|
575fe9 |
+ <classpath refid="junit.class.path" />
|
|
|
575fe9 |
</cobertura-instrument>
|
|
|
575fe9 |
|
|
|
575fe9 |
<property name="forkjunit" value="true" />
|
|
|
575fe9 |
@@ -528,7 +520,25 @@ For instructions on how to build JDOM, please view the README.txt file.
|
|
|
575fe9 |
</filterset>
|
|
|
575fe9 |
</copy>
|
|
|
575fe9 |
|
|
|
575fe9 |
- <exec dir="${mavendir}/core" executable="${gpg}">
|
|
|
575fe9 |
+ <copy filtering="true" file="maven/contrib.pom" tofile="${mavendir}/core/${mavenbase}-contrib.pom">
|
|
|
575fe9 |
+ <filterset>
|
|
|
575fe9 |
+ <filter token="artifactID" value="${mavenartifact}"/>
|
|
|
575fe9 |
+ <filter token="version" value="${version}" />
|
|
|
575fe9 |
+ <filter token="jdk" value="${compile.target}" />
|
|
|
575fe9 |
+ <filter token="license" value="${license}" />
|
|
|
575fe9 |
+ </filterset>
|
|
|
575fe9 |
+ </copy>
|
|
|
575fe9 |
+
|
|
|
575fe9 |
+ <copy filtering="true" file="maven/junit.pom" tofile="${mavendir}/core/${mavenbase}-junit.pom">
|
|
|
575fe9 |
+ <filterset>
|
|
|
575fe9 |
+ <filter token="artifactID" value="${mavenartifact}"/>
|
|
|
575fe9 |
+ <filter token="version" value="${version}" />
|
|
|
575fe9 |
+ <filter token="jdk" value="${compile.target}" />
|
|
|
575fe9 |
+ <filter token="license" value="${license}" />
|
|
|
575fe9 |
+ </filterset>
|
|
|
575fe9 |
+ </copy>
|
|
|
575fe9 |
+
|
|
|
575fe9 |
+
|
|
|
575fe9 |
<arg value="-abv"/>
|
|
|
575fe9 |
<arg value="${mavenbase}.pom"/>
|
|
|
575fe9 |
</exec>
|
|
|
575fe9 |
@@ -543,7 +553,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
|
|
575fe9 |
<exec dir="${mavendir}/core" executable="${gpg}">
|
|
|
575fe9 |
<arg value="-abv"/>
|
|
|
575fe9 |
<arg value="${mavenbase}-javadoc.jar"/>
|
|
|
575fe9 |
- </exec>
|
|
|
575fe9 |
+ </exec-->
|
|
|
575fe9 |
|
|
|
575fe9 |
|
|
|
575fe9 |
basedir="${mavendir}/core"
|
|
|
575fe9 |
--
|
|
|
575fe9 |
2.17.1
|
|
|
575fe9 |
|