donaldp 01/11/09 23:07:47
Modified: . build.bat build.sh build.xml
Log:
Update build process so that if you use the scripts then xerces.jar is
explicitly set. Otherwise it is assumed to be in lib/xerces.jar
Revision Changes Path
1.8 +1 -1 jakarta-avalon-phoenix/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.bat 2001/07/21 14:09:03 1.7
+++ build.bat 2001/11/10 07:07:47 1.8
@@ -18,6 +18,6 @@
:runAnt
set ANT_HOME=%AVALON_TOOLS%
-%AVALON_TOOLS%\bin\ant.bat -logger org.apache.tools.ant.NoBannerLogger
-emacs -Dtools.dir=%AVALON_TOOLS% %1 %2 %3 %4 %5 %6 %7 %8
+%AVALON_TOOLS%\bin\ant.bat -logger org.apache.tools.ant.NoBannerLogger
-emacs -Dtools.dir=%AVALON_TOOLS% -Dxerces.jar=%AVALON_TOOLS%\lib\xerces.jar %1
%2 %3 %4 %5 %6 %7 %8
:end
1.7 +1 -1 jakarta-avalon-phoenix/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.sh 2001/09/20 19:37:14 1.6
+++ build.sh 2001/11/10 07:07:47 1.7
@@ -20,4 +20,4 @@
chmod u+x $AVALON_TOOLS/bin/antRun
chmod u+x $AVALON_TOOLS/bin/ant
-$AVALON_TOOLS/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs
-Dtools.dir=$AVALON_TOOLS $@
+$AVALON_TOOLS/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs
-Dtools.dir=$AVALON_TOOLS -Dxerces.jar=$AVALON_TOOLS/lib/xerces.jar $@
1.71 +34 -28 jakarta-avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- build.xml 2001/11/10 00:37:51 1.70
+++ build.xml 2001/11/10 07:07:47 1.71
@@ -69,7 +69,7 @@
<property name="src.dist.dir" value="${dist.name}"/>
<property name="constants.file"
value="org/apache/avalon/phoenix/Constants.java"/>
- <property name="xerces.jar" value="${tools.dir}/lib/xerces.jar"/>
+ <property name="xerces.jar" value="lib/xerces.jar"/>
<property name="xalan.jar" value="${tools.dir}/lib/xalan-2.2.0-D8.jar"/>
<property name="framework.jar"
value="${lib.dir}/avalon-framework-20011110.jar"/>
<property name="excalibur.jar"
value="${lib.dir}/avalon-excalibur-20011110.jar"/>
@@ -97,6 +97,7 @@
<path id="tools.class.path">
<pathelement location="${xerces.jar}"/>
+ <pathelement location="${xalan.jar}"/>
<pathelement location="${tools.jar}"/>
<fileset dir="${tools.dir}/lib">
<exclude name="ant.jar" />
@@ -115,6 +116,7 @@
<target name="help" depends="usage"/>
+ <!-- Check requirements of environment -->
<target name="check-environment">
<available property="servlet.present" classname="javax.servlet.Servlet">
<classpath refid="project.class.path"/>
@@ -124,6 +126,32 @@
</available>
</target>
+ <!-- Setup the filters -->
+ <target name="setup-filters">
+ <filter token="Name" value="Avalon Phoenix"/>
+ <filter token="name" value="phoenix"/>
+ <filter token="version" value="${version}"/>
+ <filter token="year" value="${year}"/>
+ <filter token="status" value="${status}"/>
+ <filter token="release" value="${release}"/>
+ <filter token="short-version" value="${short.version}"/>
+
+ <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
+ <property name="framework.base"
value="http://jakarta.apache.org/avalon/framework"/>
+ <property name="phoenix.base"
value="http://jakarta.apache.org/avalon/phoenix"/>
+ <property name="cornerstone.base"
value="http://jakarta.apache.org/avalon/cornerstone"/>
+ <property name="logkit.base"
value="http://jakarta.apache.org/avalon/logkit"/>
+ <property name="testlet.base"
value="http://jakarta.apache.org/avalon/testlet"/>
+
+ <filter token="year" value="${year}"/>
+ <filter token="AVALON_BASE" value="${avalon.base}"/>
+ <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
+ <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
+ <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
+ <filter token="LOGKIT_BASE" value="${logkit.base}"/>
+ <filter token="TESTLET_BASE" value="${testlet.base}"/>
+ </target>
+
<!-- Prepares the build directory -->
<target name="prepare" depends="check-environment">
@@ -142,16 +170,8 @@
</target>
<!-- Create the announcements and HEADER.html -->
- <target name="announcement">
+ <target name="announcement" depends="setup-filters">
- <filter token="Name" value="Avalon Phoenix"/>
- <filter token="name" value="phoenix"/>
- <filter token="version" value="${version}"/>
- <filter token="year" value="${year}"/>
- <filter token="status" value="${status}"/>
- <filter token="release" value="${release}"/>
- <filter token="short-version" value="${short.version}"/>
-
<mkdir dir="${build.dir}" />
<mkdir dir="${dist.base}" />
@@ -255,7 +275,7 @@
</target>
<!-- Prepares the documentation directory -->
- <target name="docs" depends="javadocs" description="generates the Phoenix
documentation">
+ <target name="docs" depends="setup-filters,javadocs"
description="generates the Phoenix documentation">
<mkdir dir="${build.context}"/>
<mkdir dir="${build.xdocs}"/>
@@ -263,21 +283,6 @@
<mkdir dir="${build.dir}/work"/>
<!-- Base pointers for non-xdocs documentation. Override these in
.ant.properties to link to local docs -->
- <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
- <property name="framework.base"
value="http://jakarta.apache.org/avalon/framework"/>
- <property name="phoenix.base"
value="http://jakarta.apache.org/avalon/phoenix"/>
- <property name="cornerstone.base"
value="http://jakarta.apache.org/avalon/cornerstone"/>
- <property name="logkit.base"
value="http://jakarta.apache.org/avalon/logkit"/>
- <property name="testlet.base"
value="http://jakarta.apache.org/avalon/testlet"/>
-
- <filter token="year" value="${year}"/>
- <filter token="AVALON_BASE" value="${avalon.base}"/>
- <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
- <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
- <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
- <filter token="LOGKIT_BASE" value="${logkit.base}"/>
- <filter token="TESTLET_BASE" value="${testlet.base}"/>
-
<copy todir="${build.context}" filtering="on">
<fileset dir="${context.dir}">
<exclude name="resources/**"/>
@@ -462,7 +467,7 @@
<fileset dir="${build.javadocs}"/>
</copy>
- <copy todir="${bin.dist.dir}">
+ <copy todir="${bin.dist.dir}" filtering="on">
<fileset dir=".">
<include name="README"/>
<include name="WARNING"/>
@@ -509,11 +514,12 @@
<fileset dir="${build.javadocs}"/>
</copy>
- <copy todir="${src.dist.dir}">
+ <copy todir="${src.dist.dir}" filtering="on">
<fileset dir=".">
<include name="README"/>
<include name="WARNING"/>
<include name="LICENSE"/>
+ <include name="BUILDING.txt"/>
<include name="build.bat"/>
<include name="build.sh"/>
<include name="build.xml"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
