hammant 01/11/22 05:03:32
Modified: apps/hsql build.xml
Log:
corrections to if-logic and project-class-path
Revision Changes Path
1.6 +15 -9 jakarta-avalon-cornerstone/apps/hsql/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/hsql/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2001/11/21 07:19:58 1.5
+++ build.xml 2001/11/22 13:03:32 1.6
@@ -35,7 +35,7 @@
<property name="java.dir" value="${src.dir}/java"/>
<property name="manifest.dir" value="${src.dir}/manifest"/>
<property name="conf.dir" value="${src.dir}/conf"/>
- <property name="tools.dir" value="../../../../jakarta-avalon/tools"/>
+ <property name="tools.dir" value="../../../jakarta-avalon/tools"/>
<property name="docs.dir" value="docs"/>
<property name="xdocs.dir" value="${src.dir}/xdocs"/>
<property name="context.dir"
value="../../../jakarta-avalon/src/documentation"/>
@@ -53,6 +53,11 @@
<fileset dir="../../lib">
<include name="*.jar" />
</fileset>
+
+ <fileset dir="lib">
+ <include name="*.jar" />
+ </fileset>
+
</path>
<path id="tools.class.path">
@@ -81,7 +86,6 @@
classpathref="project.class.path"
property="hsql.present"/>
-
<mkdir dir="${build.classes}"/>
<javac srcdir="${java.dir}"
@@ -120,8 +124,8 @@
</target>
- <target name="main" depends="sars" description="Default target to generate
build products minus docs"/>
- <target name="all" depends="main,docs" description="Generate build
products including docs"/>
+ <target name="main" depends="sars" description="Default target to generate
build products minus docs" if="hsql.present"/>
+ <target name="all" depends="main,docs" description="Generate build
products including docs" if="hsql.present"/>
<target name="sars" depends="jars" if="hsql.present">
@@ -173,7 +177,9 @@
</target>
<!-- Prepares the documentation directory -->
- <target name="xdocs" description="Generates the Docs">
+ <target name="xdocs"/>
+ <!-- cant get this working yet -->
+ <target name="xdocs_alt" description="Generates the Docs">
<mkdir dir="${build.context}"/>
<mkdir dir="${build.xdocs}"/>
@@ -236,7 +242,7 @@
<!-- Completely build all dists -->
- <target name="dist" description="Generates the distribution">
+ <target name="dist" description="Generates the distribution"
if="hsql.present">
<property name="dist.name" value="${Name}-${version}"/>
@@ -288,7 +294,7 @@
</target>
<!-- Creates all the .sar files -->
- <target name="bin-dist" depends="all" >
+ <target name="bin-dist" depends="all" if="hsql.present">
<!-- bin.dist.dir usually set before this target is called -->
<property name="bin.dist.dir" value="dist"/>
@@ -306,7 +312,7 @@
<chmod dir="${bin.dist.dir}" perm="go-rwx" />
</target>
- <target name="src-dist" depends="docs">
+ <target name="src-dist" depends="docs" if="hsql.present">
<!-- src.dist.dir has usually already been set -->
<property name="src.dist.dir" value="dist-src"/>
<property name="src.dist.src" value="${src.dist.dir}/src"/>
@@ -326,7 +332,7 @@
<chmod dir="${src.dist.dir}" perm="go-rwx" />
</target>
- <target name="install" depends="main" description="Installs into Phoenix">
+ <target name="install" depends="main" description="Installs into Phoenix"
if="hsql.present">
<!-- <fail message="install.dir not specified." unless="install.dir"/>
-->
<echo message="Installing to ${install.dir}" />
<delete dir="${install.dir}/avalon-hsql" />
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
