dfs 01/05/22 18:16:44
Modified: build build.xml
Log:
Fixed package-tgz target so that build.sh and antRun will have executable
permissions set in tarball.
Revision Changes Path
1.10 +29 -14 jakarta-oro/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-oro/build/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 2001/05/21 00:18:50 1.9
+++ build.xml 2001/05/23 01:16:40 1.10
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: build.xml,v 1.9 2001/05/21 00:18:50 dfs Exp $ -->
+<!-- $Id: build.xml,v 1.10 2001/05/23 01:16:40 dfs Exp $ -->
<project name="Jakarta-ORO" default="jar" basedir=".">
@@ -14,7 +14,7 @@
<property name="javadoc.destdir" value="${top.dir}/docs/api"/>
<property name="final.name" value="${project}-${version}"/>
- <property name="final.dir" value="${top.dir}/${final.name}/"/>
+ <property name="final.dir" value="${top.dir}/${final.name}"/>
<property name="debug" value="off"/>
<property name="optimize" value="on"/>
<property name="deprecation" value="off"/>
@@ -27,11 +27,9 @@
<target name="prepare">
<mkdir dir="${build.dest}"/>
<mkdir dir="${docs.dest}"/>
- <available classname="org.apache.velocity.anakia.AnakiaTask"
- property="AnakiaTask.present"/>
- <!--
- <chmod perm="+x" file="bin/antRun"/>
- -->
+ <available classname="org.apache.velocity.anakia.AnakiaTask"
+ property="AnakiaTask.present"/>
+ <chmod perm="ugo+x" file="${top.dir}/build/bin/antRun"/>
</target>
<target name="prepare-error" depends="prepare"
@@ -136,14 +134,14 @@
</fileset>
</copy>
- <mkdir dir="${docs.dest}/classes"/>
- <copy todir="${docs.dest}/classes" filtering="no">
+ <mkdir dir="${docs.dest}/classes"/>
+ <copy todir="${docs.dest}/classes" filtering="no">
<fileset dir="${build.dest}">
<include name="MatcherDemoApplet.class"/>
</fileset>
</copy>
- <mkdir dir="${docs.dest}/classes/org"/>
- <copy todir="${docs.dest}/classes/org" filtering="no">
+ <mkdir dir="${docs.dest}/classes/org"/>
+ <copy todir="${docs.dest}/classes/org" filtering="no">
<fileset dir="${build.dest}/org">
<include name="**/*.class"/>
</fileset>
@@ -161,7 +159,9 @@
<fileset dir="${docs.dest}"/>
</copy>
<copy todir="${final.dir}/build">
- <fileset dir="${top.dir}/build"/>
+ <fileset dir="${top.dir}/build">
+ <exclude name="velocity.log"/>
+ </fileset>
</copy>
<copy file="${top.dir}/LICENSE" tofile="${final.dir}/LICENSE"/>
@@ -171,18 +171,32 @@
<copy file="${top.dir}/STYLE" tofile="${final.dir}/STYLE"/>
<copy file="${top.dir}/TODO" tofile="${final.dir}/TODO"/>
<copy file="${top.dir}/${final.name}.jar"
tofile="${final.dir}/${final.name}.jar"/>
+ <chmod perm="ugo+rx" file="${final.dir}/build/build.sh"/>
</target>
<!-- package-zip target. Packages the distribution with ZIP -->
<target name="package-zip" depends="package">
- <zip zipfile="${top.dir}/${project}-${version}.zip" basedir="${top.dir}/"
includes="**/${final.name}/**"/>
+ <zip zipfile="${top.dir}/${final.name}.zip" basedir="${top.dir}/"
+ includes="**/${final.name}/**" excludes="**/.cvsignore"/>
</target>
<!-- Packages the distribution with TAR-GZIP -->
<target name="package-tgz" depends="package">
- <tar tarfile="${top.dir}/${project}-${version}.tar" basedir="${top.dir}/"
includes="**/${final.name}/**"/>
+ <tar tarfile="${top.dir}/${final.name}.tar"
+ basedir="${top.dir}" excludes="**/**">
+ <tarfileset dir="${final.dir}/.." mode="755">
+ <include name="${final.name}/build/build.sh"/>
+ <include name="${final.name}/build/bin/antRun"/>
+ </tarfileset>
+ <tarfileset dir="${final.dir}/..">
+ <include name="${final.name}/**"/>
+ <exclude name="${final.name}/build/build.sh"/>
+ <exclude name="${final.name}/build/bin/antRun"/>
+ <exclude name="**/.cvsignore"/>
+ </tarfileset>
+ </tar>
<gzip zipfile="${top.dir}/${project}-${version}.tar.gz"
src="${top.dir}/${project}-${version}.tar"/>
</target>
@@ -197,6 +211,7 @@
<delete dir="${build.dest}"/>
<delete dir="${javadoc.destdir}"/>
<delete dir="${final.dir}"/>
+ <!-- Remove this if any source documents ever reside in docs.dest. -->
<delete dir="${docs.dest}"/>
<delete file="${top.dir}/${final.name}.jar"/>
<delete file="${top.dir}/${final.name}.tar"/>
