rsitze 2002/09/18 14:57:42
Modified: java/xmls targets.xml
Log:
Build was looping over target compile.
Setting inheritAll="false" corrects that problem.
Shouldn't break (tests execute) anything, since a standalone build/run should do
effectively the same thing.
Revision Changes Path
1.34 +14 -10 xml-axis/java/xmls/targets.xml
Index: targets.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/xmls/targets.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- targets.xml 18 Sep 2002 21:09:38 -0000 1.33
+++ targets.xml 18 Sep 2002 21:57:42 -0000 1.34
@@ -14,19 +14,19 @@
This is an accessory function to echo out fileNames
=================================================================== -->
<target name="echo-file">
- <basename property="fileName" file="${file}"/>
- <dirname property="dirName" file="${file}"/>
- <echo message="Dir: ${dirName} File: ${fileName}"/>
+ <basename property="fileName" file="${file}"/>
+ <dirname property="dirName" file="${file}"/>
+ <echo message="Dir: ${dirName} File: ${fileName}"/>
</target>
<!-- ===================================================================
This is an accessory function to compile some given component
=================================================================== -->
<target name="component-compile">
- <echo message="${file}"/>
- <basename property="fileName" file="${file}"/>
- <dirname property="dirName" file="${file}"/>
- <ant dir="${dirName}" antfile="${fileName}" target="compile"/>
+ <echo message="${file}"/>
+ <basename property="fileName" file="${file}"/>
+ <dirname property="dirName" file="${file}"/>
+ <ant inheritAll="false" dir="${dirName}" antfile="${fileName}"
target="compile"/>
</target>
<!-- ===================================================================
@@ -35,7 +35,9 @@
=================================================================== -->
<target name="batch-component-test">
<antcall target="echo-file"/>
- <ant antfile="${file}" target="component-junit-functional"/>
+ <basename property="fileName" file="${file}"/>
+ <dirname property="dirName" file="${file}"/>
+ <ant inheritAll="false" dir="${dirName}" antfile="${fileName}"
target="component-junit-functional"/>
</target>
<!-- ===================================================================
@@ -43,7 +45,9 @@
=================================================================== -->
<target name="batch-component-run">
<antcall target="echo-file"/>
- <ant antfile="${file}" target="run"/>
+ <basename property="fileName" file="${file}"/>
+ <dirname property="dirName" file="${file}"/>
+ <ant inheritAll="false" dir="${dirName}" antfile="${fileName}" target="run"/>
</target>
<!-- =================================================================== -->
@@ -409,5 +413,5 @@
<target name="transport-layer" depends="setenv" >
<mkdir dir="${test.functional.reportdir}" />
- <ant antfile="${axis.home}/samples/transport/build.xml" target="compile" />
+ <ant inheritAll="false" dir="${axis.home}/samples/transport"
antfile="build.xml" target="compile" />
</target>
