Now dist targets work: src dist has all libs needed with examples and the bin dist has also the logging classes (core+optional).

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352248 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nicola Ken Barozzi 2002-03-18 12:42:54 +00:00
parent 114950f0b2
commit 86d900ab4f
2 changed files with 30 additions and 12 deletions

View File

@ -7,6 +7,9 @@
<mkdir dir="${dist.root}"/> <mkdir dir="${dist.root}"/>
<mkdir dir="${dist.src.dir}"/> <mkdir dir="${dist.src.dir}"/>
<mkdir dir="${dist.src.dir}/lib"/> <mkdir dir="${dist.src.dir}/lib"/>
<mkdir dir="${dist.src.dir}/lib/core"/>
<mkdir dir="${dist.src.dir}/lib/optional"/>
<mkdir dir="${dist.src.dir}/lib/endorsed"/>
<mkdir dir="${dist.src.dir}/src"/> <mkdir dir="${dist.src.dir}/src"/>
<mkdir dir="${dist.src.dir}/src/java"/> <mkdir dir="${dist.src.dir}/src/java"/>
<mkdir dir="${dist.src.dir}/src/documentation"/> <mkdir dir="${dist.src.dir}/src/documentation"/>
@ -14,6 +17,7 @@
<mkdir dir="${dist.src.dir}/src/scratchpad"/> <mkdir dir="${dist.src.dir}/src/scratchpad"/>
<mkdir dir="${dist.src.dir}/src/testcases"/> <mkdir dir="${dist.src.dir}/src/testcases"/>
<mkdir dir="${dist.src.dir}/src/contrib"/> <mkdir dir="${dist.src.dir}/src/contrib"/>
<mkdir dir="${dist.src.dir}/src/examples"/>
<mkdir dir="${dist.src.dir}/src/targets"/> <mkdir dir="${dist.src.dir}/src/targets"/>
<mkdir dir="${dist.src.dir}/docs"/> <mkdir dir="${dist.src.dir}/docs"/>
<mkdir dir="${dist.src.dir}/docs/apidocs"/> <mkdir dir="${dist.src.dir}/docs/apidocs"/>
@ -34,7 +38,7 @@
<copy todir="${dist.src.dir}/lib"> <copy todir="${dist.src.dir}/lib">
<fileset dir="${lib.dir}"/> <fileset dir="${lib.dir}"/>
</copy> </copy>
<copy todir="${dist.src.dir}/src/resources" filtering="on"> <copy todir="${dist.src.dir}/src/resources" filtering="on">
<fileset dir="${resource.dir}"> <fileset dir="${resource.dir}">
<exclude name="**/*.gif"/> <exclude name="**/*.gif"/>
@ -63,6 +67,10 @@
<fileset dir="${contrib.dir}"/> <fileset dir="${contrib.dir}"/>
</copy> </copy>
<copy todir="${dist.src.dir}/src/examples" filtering="off">
<fileset dir="${examples.dir}"/>
</copy>
<copy todir="${dist.src.dir}/src/targets" filtering="off"> <copy todir="${dist.src.dir}/src/targets" filtering="off">
<fileset dir="./src/targets"/> <fileset dir="./src/targets"/>
</copy> </copy>
@ -131,10 +139,20 @@
<mkdir dir="${dist.root}"/> <mkdir dir="${dist.root}"/>
<mkdir dir="${dist.bin.dir}"/> <mkdir dir="${dist.bin.dir}"/>
<mkdir dir="${dist.bin.dir}/lib"/> <mkdir dir="${dist.bin.dir}/lib"/>
<mkdir dir="${dist.src.dir}/lib/core"/>
<mkdir dir="${dist.src.dir}/lib/optional"/>
<mkdir dir="${dist.bin.dir}/docs"/> <mkdir dir="${dist.bin.dir}/docs"/>
<mkdir dir="${dist.bin.dir}/docs/apidocs"/> <mkdir dir="${dist.bin.dir}/docs/apidocs"/>
<copy file="${build.dir}/${name}.jar" tofile="${dist.bin.dir}/lib/${name}-${version}.jar"/> <copy todir="${dist.bin.dir}/lib/core">
<fileset dir="${lib.dir}/core"/>
</copy>
<copy todir="${dist.bin.dir}/lib/optional">
<fileset dir="${lib.dir}/optional"/>
</copy>
<copy file="${build.dir}/${name}.jar" tofile="${dist.bin.dir}/lib/core/${name}-${version}.jar"/>
<copy todir="${dist.bin.dir}/docs"> <copy todir="${dist.bin.dir}/docs">
<fileset dir="${build.docs}"/> <fileset dir="${build.docs}"/>
@ -184,15 +202,15 @@
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="distclean" depends="clean" description="* Cleans everything to the original state"> <target name="distclean" depends="clean" description="* Cleans everything to the original state">
<delete dir="${build.root}"/> <delete dir="${build.root}"/>
<delete file="${dist.target}/${Name}-${version}.tar.gz"/> <delete file="${dist.target}/core/${Name}-${version}.tar.gz"/>
<delete file="${dist.target}/${Name}-${version}.tar"/> <delete file="${dist.target}/core/${Name}-${version}.tar"/>
<delete file="${dist.target}/${Name}-${version}.zip"/> <delete file="${dist.target}/core/${Name}-${version}.zip"/>
<delete file="${dist.target}/${Name}-${version}-src.tar.gz"/> <delete file="${dist.target}/core/${Name}-${version}-src.tar.gz"/>
<delete file="${dist.target}/${Name}-${version}-src.tar"/> <delete file="${dist.target}/core/${Name}-${version}-src.tar"/>
<delete file="${dist.target}/${Name}-${version}-src.zip"/> <delete file="${dist.target}/core/${Name}-${version}-src.zip"/>
<delete file="${dist.target}/${Name}-${version}-bin.tar.gz"/> <delete file="${dist.target}/core/${Name}-${version}-bin.tar.gz"/>
<delete file="${dist.target}/${Name}-${version}-bin.tar"/> <delete file="${dist.target}/core/${Name}-${version}-bin.tar"/>
<delete file="${dist.target}/${Name}-${version}-bin.zip"/> <delete file="${dist.target}/core/${Name}-${version}-bin.zip"/>
<delete dir="${dist.root}"/> <delete dir="${dist.root}"/>
</target> </target>

View File

@ -54,7 +54,7 @@
<property name="fullname" value="${xml.project.name}"/> <property name="fullname" value="${xml.project.name}"/>
<property name="name" value="${xml.project.info.module}"/> <property name="name" value="${xml.project.info.module}"/>
<property name="Name" value="${xml.project.name}"/> <property name="Name" value="${xml.project.name}"/>
<property name="packages" value="${xml.project.info.packages}"/> <property name="packages" value="${xml.project.module.project.package}.*"/>
<property name="short.version" value="${xml.project.info.version}"/> <property name="short.version" value="${xml.project.info.version}"/>
<property name="version.tag" value="${xml.project.info.tag}"/> <property name="version.tag" value="${xml.project.info.tag}"/>
<property name="version" value="${short.version}-${version.tag}"/> <property name="version" value="${short.version}-${version.tag}"/>