You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
102 lines
4.0 KiB
102 lines
4.0 KiB
6 years ago
|
From 05a8a2fa49e92ad36a86d5d73588a2e46bf9ff95 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Simacek <msimacek@redhat.com>
|
||
|
|
Date: Mon, 23 Jul 2018 14:30:14 +0200
|
||
|
|
Subject: [PATCH] Adapt build
|
||
|
|
|
||
|
|
---
|
||
|
|
build.xml | 40 +++++++++++++++++++++++++---------------
|
||
|
|
1 file changed, 25 insertions(+), 15 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/build.xml b/build.xml
|
||
|
|
index cd7c2ed..10d8df6 100644
|
||
|
|
--- a/build.xml
|
||
|
|
+++ b/build.xml
|
||
|
|
@@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||
|
|
|
||
|
|
<!-- Compilation class path -->
|
||
|
|
<path id="base.class.path">
|
||
|
|
- <pathelement location="${jaxen.jar}" />
|
||
|
|
- <pathelement location="${parser.jar}" />
|
||
|
|
- <pathelement location="${xmlapi.jar}" />
|
||
|
|
- <pathelement location="${junit.jar}" />
|
||
|
|
- <pathelement location="${isorelax.jar}" />
|
||
|
|
- <pathelement location="${xalan.jar}" />
|
||
|
|
- <pathelement location="${xalanser.jar}" />
|
||
|
|
- <!-- normally these stax jars will not be found -->
|
||
|
|
- <!-- this is used for testing Java5 (the test sets stax.dir) -->
|
||
|
|
- <pathelement location="${stax.dir}/jsr173_1.0_api.jar" />
|
||
|
|
- <pathelement location="${stax.dir}/sjsxp.jar" />
|
||
|
|
+ <fileset dir="${lib.dir}" includes="*.jar" />
|
||
|
|
</path>
|
||
|
|
|
||
|
|
<path id="core.class.path">
|
||
|
|
@@ -289,6 +279,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||
|
|
header="<b>${Name}<br><font size='-1'>${version}</font></b>"
|
||
|
|
bottom="Copyright © ${year} Jason Hunter, Brett McLaughlin. All Rights Reserved.">
|
||
|
|
<classpath refid="base.class.path"/>
|
||
|
|
+ <link href="${j2se.apidoc}"/>
|
||
|
|
</javadoc>
|
||
|
|
</target>
|
||
|
|
|
||
|
|
@@ -373,11 +364,11 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||
|
|
<!-- =================================================================== -->
|
||
|
|
<target name="package" depends="coverage, jars"
|
||
|
|
description="Creates the class package">
|
||
|
|
- <zip destfile="${package}/${jarbase}.zip">
|
||
|
|
+ <!--<zip destfile="${package}/${jarbase}.zip">
|
||
|
|
<fileset dir="${package}" includes="${jarbase}*.jar" />
|
||
|
|
<fileset dir="${basedir}" includes="lib/xerces* lib/jaxen* lib/xml* lib/xalan/**" />
|
||
|
|
<fileset dir="${basedir}" includes="LICENSE.txt README.txt" />
|
||
|
|
- </zip>
|
||
|
|
+ </zip>-->
|
||
|
|
</target>
|
||
|
|
|
||
|
|
<!-- =================================================================== -->
|
||
|
|
@@ -401,6 +392,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||
|
|
<include name="**/*.class"/>
|
||
|
|
<!-- exclude name="**/**/jaxen/**/*.class"/ -->
|
||
|
|
</fileset>
|
||
|
|
+ <classpath refid="junit.class.path" />
|
||
|
|
</cobertura-instrument>
|
||
|
|
|
||
|
|
<property name="forkjunit" value="true" />
|
||
|
|
@@ -528,7 +520,25 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||
|
|
</filterset>
|
||
|
|
</copy>
|
||
|
|
|
||
|
|
- <exec dir="${mavendir}/core" executable="${gpg}">
|
||
|
|
+ <copy filtering="true" file="maven/contrib.pom" tofile="${mavendir}/core/${mavenbase}-contrib.pom">
|
||
|
|
+ <filterset>
|
||
|
|
+ <filter token="artifactID" value="${mavenartifact}"/>
|
||
|
|
+ <filter token="version" value="${version}" />
|
||
|
|
+ <filter token="jdk" value="${compile.target}" />
|
||
|
|
+ <filter token="license" value="${license}" />
|
||
|
|
+ </filterset>
|
||
|
|
+ </copy>
|
||
|
|
+
|
||
|
|
+ <copy filtering="true" file="maven/junit.pom" tofile="${mavendir}/core/${mavenbase}-junit.pom">
|
||
|
|
+ <filterset>
|
||
|
|
+ <filter token="artifactID" value="${mavenartifact}"/>
|
||
|
|
+ <filter token="version" value="${version}" />
|
||
|
|
+ <filter token="jdk" value="${compile.target}" />
|
||
|
|
+ <filter token="license" value="${license}" />
|
||
|
|
+ </filterset>
|
||
|
|
+ </copy>
|
||
|
|
+
|
||
|
|
+ <!--exec dir="${mavendir}/core" executable="${gpg}">
|
||
|
|
<arg value="-abv"/>
|
||
|
|
<arg value="${mavenbase}.pom"/>
|
||
|
|
</exec>
|
||
|
|
@@ -543,7 +553,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||
|
|
<exec dir="${mavendir}/core" executable="${gpg}">
|
||
|
|
<arg value="-abv"/>
|
||
|
|
<arg value="${mavenbase}-javadoc.jar"/>
|
||
|
|
- </exec>
|
||
|
|
+ </exec-->
|
||
|
|
|
||
|
|
<jar destfile="${mavendir}/${mavenbase}-maven-bundle.jar"
|
||
|
|
basedir="${mavendir}/core"
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|