Updated Ant to version 1.3, package building now works

This commit is contained in:
hns 2001-06-25 13:31:51 +00:00
parent ec4f8e4fb2
commit 467eccf1bb
5 changed files with 73 additions and 23 deletions

Binary file not shown.

View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# -------------------------------------------- # --------------------------------------------
# Defualt == jar # Default == jar
# "core" target builds core classes # "core" target builds core classes
# "clean" target removes bin directory # "clean" target removes bin directory
# "jar" target builds core + jar # "jar" target builds core + jar
@ -10,6 +10,8 @@
# -------------------------------------------- # --------------------------------------------
TARGET=${1} TARGET=${1}
export CVSHOME=:pserver:anonymous@coletta.helma.at:/opt/cvs
cvs -d :pserver:anonymous@coletta.helma.at:/opt/cvs login cvs -d :pserver:anonymous@coletta.helma.at:/opt/cvs login
JAVA_HOME=/usr/lib/jdk1.3 JAVA_HOME=/usr/lib/jdk1.3
@ -33,7 +35,7 @@ fi
echo "Now building ${TARGET}..." echo "Now building ${TARGET}..."
CP=${CLASSPATH}:ant.jar:jaxp.jar:parser.jar CP=${CLASSPATH}:ant.jar:jaxp.jar:parser.jar:../lib/netcomponents.jar:jakarta-ant-1.3-optional.jar
echo "Classpath: ${CP}" echo "Classpath: ${CP}"
echo "JAVA_HOME: ${JAVA_HOME}" echo "JAVA_HOME: ${JAVA_HOME}"
@ -41,3 +43,4 @@ echo "JAVA_HOME: ${JAVA_HOME}"
BUILDFILE=build.xml BUILDFILE=build.xml
${JAVA_HOME}/bin/java -classpath ${CP} org.apache.tools.ant.Main -buildfile ${BUILDFILE} ${TARGET} ${JAVA_HOME}/bin/java -classpath ${CP} org.apache.tools.ant.Main -buildfile ${BUILDFILE} ${TARGET}

View file

@ -9,15 +9,16 @@
<!-- Initializes some variables --> <!-- Initializes some variables -->
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="init"> <target name="init">
<property name="Name" value="Hop"/> <property name="Name" value="helma"/>
<property name="year" value="1998-2001"/> <property name="year" value="1998-2001"/>
<property name="version" value="1.0.beta1"/> <property name="version" value="1.2"/>
<property name="project" value="hop"/> <property name="project" value="helma"/>
<property name="build.compiler" value="classic"/> <property name="build.compiler" value="classic"/>
<property name="build.dir" value="../work"/> <property name="build.dir" value="../work"/>
<property name="build.src" value="${build.dir}/src"/> <property name="build.src" value="${build.dir}/src"/>
<property name="build.dest" value="${build.dir}/classes"/> <property name="build.dest" value="${build.dir}/classes"/>
<property name="build.checkout" value="${build.dir}/checkout"/> <property name="build.checkout" value="${build.dir}/checkout"/>
<property name="cvs.root" value=":pserver:anonymous@coletta.helma.at:/opt/cvs"/>
<property name="javadoc.destdir" value="../docs/apidocs"/> <property name="javadoc.destdir" value="../docs/apidocs"/>
<property name="jar.name" value="helma"/> <property name="jar.name" value="helma"/>
<property name="final.name" value="${project}-${version}"/> <property name="final.name" value="${project}-${version}"/>
@ -47,13 +48,10 @@
<mkdir dir="${build.src}"/> <mkdir dir="${build.src}"/>
<mkdir dir="${build.checkout}"/> <mkdir dir="${build.checkout}"/>
<cvs cvsRoot=":pserver:anonymous@coletta.helma.at:/opt/cvs" <cvs cvsRoot="${cvs.root}" package="hop" dest="${build.checkout}"/>
package="hop" <cvs cvsRoot="${cvs.root}" package="apps/hopblog" dest="${build.dir}"/>
dest="${build.checkout}"/> <cvs cvsRoot="${cvs.root}" package="hopbuild/lib" dest="${build.dir}"/>
<cvs cvsRoot="${cvs.root}" package="hopbuild/skeleton" dest="${build.dir}"/>
<cvs cvsRoot=":pserver:anonymous@coletta.helma.at:/opt/cvs"
package="hopbuild/lib"
dest="${build.dir}"/>
<copy todir="${build.src}"> <copy todir="${build.src}">
<fileset dir="${build.checkout}/hop" <fileset dir="${build.checkout}/hop"
@ -151,13 +149,29 @@
<!-- =================================================================== --> <!-- =================================================================== -->
<!-- Package --> <!-- Package -->
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="package" depends="jar,javadocs"> <target name="package" depends="jar">
<mkdir dir="${final.dir}"/> <mkdir dir="${final.dir}"/>
<copydir src="${build.dir}/src/" dest="${final.dir}/src/"/> <!-- mkdir dir="${final.dir}/static"/ -->
<copydir src="../docs" dest="${final.dir}/docs"/> <mkdir dir="${final.dir}/src"/>
<copydir src="../lib" dest="${final.dir}/lib"/> <jar jarfile="${final.dir}/src/${Name}-src.jar"
<copydir src="../build" dest="${final.dir}/build"/> basedir="${build.src}"/>
<copyfile src="${build.dir}/${final.name}.jar" dest="${final.dir}/${final.name}.jar"/> <!-- copy todir="${final.dir}/src">
<fileset dir="${build.dir}/src"/>
</copy -->
<copy todir="${final.dir}/docs">
<fileset dir="../docs"/>
</copy>
<copy todir="${final.dir}/lib">
<fileset dir="../lib"/>
</copy>
<copy todir="${final.dir}">
<fileset dir="${build.dir}/hopbuild/skeleton"/>
</copy>
<copy todir="${final.dir}/apps/base">
<fileset dir="${build.dir}/apps/hopblog" excludes="**/CVS"/>
</copy>
<copy file="${build.dir}/${jar.name}.jar" todir="${final.dir}/lib"/>
<chmod file="${final.dir}/hop.sh" perm="755"/>
</target> </target>
<!-- =================================================================== --> <!-- =================================================================== -->
@ -171,7 +185,15 @@
<!-- Packages the distribution with TAR-GZIP --> <!-- Packages the distribution with TAR-GZIP -->
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="package-tgz" depends="package"> <target name="package-tgz" depends="package">
<tar tarfile="../${Name}-${version}.tar" basedir="../" includes="**/${final.name}/**"/> <tar tarfile="../${Name}-${version}.tar">
<tarfileset dir="../" mode="755">
<include name="hop.sh"/>
</tarfileset>
<tarfileset dir="../">
<include name="**/${final.name}/**"/>
<exclude name="hop.sh"/>
</tarfileset>
</tar>
<gzip zipfile="../${Name}-${version}.tar.gz" src="../${Name}-${version}.tar"/> <gzip zipfile="../${Name}-${version}.tar.gz" src="../${Name}-${version}.tar"/>
</target> </target>
@ -188,6 +210,31 @@
<copy file="${build.dir}/${jar.name}.jar" tofile="../helma-${DSTAMP}.jar"/> <copy file="${build.dir}/${jar.name}.jar" tofile="../helma-${DSTAMP}.jar"/>
</target> </target>
<!-- =================================================================== -->
<!-- Packages and FTPs the distribution with ZIP and TAG-GZIP -->
<!-- =================================================================== -->
<target name="ftp-all" depends="package-all">
<ftp server="piefke.helma.at"
userid="anonymous"
password="tobi@helma.at">
<fileset dir="${build.dir}">
<include name="${Name}-${version}.zip,${Name}-${version}.tar.gz"/>
</fileset>
</ftp>
</target>
<target name="ftp-test" depends="">
<ftp server="piefke.helma.at"
userid="anonymous"
password="tobi@helma.at">
<fileset dir="${build.dir}">
<include name="${Name}-${version}.zip,${Name}-${version}.tar.gz"/>
</fileset>
</ftp>
</target>
</project> </project>

Binary file not shown.

Binary file not shown.