donaldp 01/03/30 00:18:34
Modified: . build.xml
Log:
Made it possible to reference a global directory ${cjan.lib} that contains
implementations of all dependent jars.
Also made it possible to install into a global ${phoenix.home}
If a user wants to take advantage of this they should ideally set them in a
.ant.properties in their home directory. They then run build.[sh|bat] install rather
than standard command.
Revision Changes Path
1.11 +14 -11 jakarta-avalon-cornerstone/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 2001/03/29 03:17:29 1.10
+++ build.xml 2001/03/30 08:18:32 1.11
@@ -78,6 +78,8 @@
<pathelement location="${phoenix-client.jar}"/>
<fileset dir="${lib.dir}">
<include name="*.jar" />
+ <exclude name="phoenix-client.jar"/>
+ <exclude name="avalonapi.jar"/>
</fileset>
<pathelement path="${build.classes}" />
</path>
@@ -393,22 +395,23 @@
</target>
- <target name="install" depends="jars,install-check" if="install.dir">
+ <target name="install" depends="jars,install-check-cjan,install-check-phoenix">
+ <mkdir dir="${cjan.lib}" />
+ <copy file="${build.lib}/cornerstone.bar" todir="${cjan.lib}"/>
- <property name="install.apps" value="${install.dir}/apps"/>
- <delete file="${install.apps}/avalon-demo.sar"/>
- <delete dir="${install.apps}/avalon-demo"/>
- <copy file="${build.lib}/avalon-demo.sar" todir="${install.apps}"/>
+ <property name="phoenix.apps" value="${phoenix.home}/apps"/>
+ <mkdir dir="${phoenix.apps}" />
+ <delete dir="${phoenix.apps}/avalon-demo"/>
+ <copy file="${build.lib}/avalon-demo.sar" todir="${phoenix.apps}"/>
</target>
- <target name="install-check" unless="install.dir">
-
- <property name="install.dir" value="../jakarta-avalon-phoenix/dist"/>
-
- <echo message="install.dir not specified." />
- <echo message="Guessing install.dir=${install.dir}" />
+ <target name="install-check-cjan" unless="cjan.lib">
+ <fail message="cjan.lib not specified." />
+ </target>
+ <target name="install-check-phoenix" unless="phoenix.home">
+ <fail message="phoenix.home not specified." />
</target>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
