You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mu...@apache.org on 2022/12/10 09:20:58 UTC
[xalan-java] branch xalan-j_2_7_1_maint updated: improving xalanj build flow, when the build is done from the xalanj scr distribution (for e.g, from xalan-j_2_7_3-src.zip or xalan-j_2_7_3-src.tar.gz)
This is an automated email from the ASF dual-hosted git repository.
mukulg pushed a commit to branch xalan-j_2_7_1_maint
in repository https://gitbox.apache.org/repos/asf/xalan-java.git
The following commit(s) were added to refs/heads/xalan-j_2_7_1_maint by this push:
new bf4529f0 improving xalanj build flow, when the build is done from the xalanj scr distribution (for e.g, from xalan-j_2_7_3-src.zip or xalan-j_2_7_3-src.tar.gz)
bf4529f0 is described below
commit bf4529f0ea8383e305b4488c880f0c1e89f23824
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Sat Dec 10 14:50:42 2022 +0530
improving xalanj build flow, when the build is done from the xalanj scr
distribution (for e.g, from xalan-j_2_7_3-src.zip or
xalan-j_2_7_3-src.tar.gz)
---
build.xml | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/build.xml b/build.xml
index f73bb882..73a01549 100644
--- a/build.xml
+++ b/build.xml
@@ -1281,8 +1281,7 @@ $Id$
<target name="autodist-mkdirs">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/lib"/>
- <mkdir dir="${dist.dir}/lib/endorsed"/>
- <mkdir dir="${dist.dir}/tests"/>
+ <mkdir dir="${dist.dir}/lib/endorsed"/>
<mkdir dir="${dist.dir}/samples"/>
<mkdir dir="${dist.dir}/src"/>
<mkdir dir="${dist.dir}/tools"/>
@@ -1357,16 +1356,33 @@ $Id$
<copy file="${xmlapis.jar}" todir="${dist.dir}" />
<copy file="${parser.jar}" todir="${dist.dir}" />
- <copy file="${test.relpath}/java/build/testxsl.jar" todir="${dist.dir}/lib" />
- <copy todir="${dist.dir}/tests">
- <fileset dir="${test.relpath}/tests"/>
- </copy>
+ <antcall target="xalan.tests.testxsl.jar.copy"/>
+ <antcall target="xalan.tests.folder.copy"/>
<copy todir="${dist.dir}">
<fileset dir="." includes="readme.html,KEYS,build.xml,build.sh,build.bat,commits.xml,
LICENSE.txt,NOTICE.txt"/>
</copy>
</target>
+
+ <target name="xalan.tests.testxsl.jar.copy" depends="check-testxsl.jar" if="testxsl.jar.present">
+ <copy file="${test.relpath}/java/build/testxsl.jar" todir="${dist.dir}/lib" />
+ </target>
+
+ <target name="xalan.tests.folder.copy" depends="check-tests.folder" if="tests.folder.present">
+ <mkdir dir="${dist.dir}/tests"/>
+ <copy todir="${dist.dir}/tests">
+ <fileset dir="${test.relpath}/tests"/>
+ </copy>
+ </target>
+
+ <target name="check-testxsl.jar">
+ <available file="${test.relpath}/java/build/testxsl.jar" property="testxsl.jar.present"/>
+ </target>
+
+ <target name="check-tests.folder">
+ <available file="${test.relpath}/tests" type="dir" property="tests.folder.present"/>
+ </target>
<target name="autodist-copy-files-docs">
<!-- Copy built documentation and javadoc -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org