You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by le...@apache.org on 2003/06/11 10:19:17 UTC
cvs commit: avalon/framework build.xml
leosimons 2003/06/11 01:19:17
Modified: fortress/examples build.xml
fortress/tools build.xml
fortress/platform build.xml
fortress/servlet build.xml
fortress/cli build.xml
buildsystem maven.xml
fortress/container build.xml
framework build.xml
Log:
fix a bug in the generated build.xml files.
Revision Changes Path
1.2 +4 -4 avalon/fortress/examples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon/fortress/examples/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 9 Jun 2003 15:27:45 -0000 1.1
+++ build.xml 11 Jun 2003 08:19:16 -0000 1.2
@@ -5,7 +5,7 @@
<property file="${basedir}/project.properties"></property>
-
+
<property file="${basedir}/../project.properties"></property>
<property file="${basedir}/../../project.properties"></property>
<property file="${basedir}/../../../project.properties"></property>
@@ -23,9 +23,10 @@
</fail>
</target>
-
+
<target name="delegate">
-
+ <available file="${avalon.buildsystem}/maven-common-gump-build.xml"
+ property="avalon.buildsystem.available"></available>
<antcall target="need-for-common-build"></antcall>
<ant inheritRefs="true" target="avalon:${target}" antfile="${avalon.buildsystem}/maven-common-gump-build.xml" inheritAll="true"></ant>
@@ -56,4 +57,3 @@
</target>
</project>
-
\ No newline at end of file
1.2 +4 -4 avalon/fortress/tools/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon/fortress/tools/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 9 Jun 2003 15:27:45 -0000 1.1
+++ build.xml 11 Jun 2003 08:19:16 -0000 1.2
@@ -5,7 +5,7 @@
<property file="${basedir}/project.properties"></property>
-
+
<property file="${basedir}/../project.properties"></property>
<property file="${basedir}/../../project.properties"></property>
<property file="${basedir}/../../../project.properties"></property>
@@ -23,9 +23,10 @@
</fail>
</target>
-
+
<target name="delegate">
-
+ <available file="${avalon.buildsystem}/maven-common-gump-build.xml"
+ property="avalon.buildsystem.available"></available>
<antcall target="need-for-common-build"></antcall>
<ant inheritRefs="true" target="avalon:${target}" antfile="${avalon.buildsystem}/maven-common-gump-build.xml" inheritAll="true"></ant>
@@ -56,4 +57,3 @@
</target>
</project>
-
\ No newline at end of file
1.2 +4 -4 avalon/fortress/platform/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon/fortress/platform/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 9 Jun 2003 15:27:44 -0000 1.1
+++ build.xml 11 Jun 2003 08:19:16 -0000 1.2
@@ -5,7 +5,7 @@
<property file="${basedir}/project.properties"></property>
-
+
<property file="${basedir}/../project.properties"></property>
<property file="${basedir}/../../project.properties"></property>
<property file="${basedir}/../../../project.properties"></property>
@@ -23,9 +23,10 @@
</fail>
</target>
-
+
<target name="delegate">
-
+ <available file="${avalon.buildsystem}/maven-common-gump-build.xml"
+ property="avalon.buildsystem.available"></available>
<antcall target="need-for-common-build"></antcall>
<ant inheritRefs="true" target="avalon:${target}" antfile="${avalon.buildsystem}/maven-common-gump-build.xml" inheritAll="true"></ant>
@@ -56,4 +57,3 @@
</target>
</project>
-
\ No newline at end of file
1.2 +4 -4 avalon/fortress/servlet/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon/fortress/servlet/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 9 Jun 2003 15:27:45 -0000 1.1
+++ build.xml 11 Jun 2003 08:19:16 -0000 1.2
@@ -5,7 +5,7 @@
<property file="${basedir}/project.properties"></property>
-
+
<property file="${basedir}/../project.properties"></property>
<property file="${basedir}/../../project.properties"></property>
<property file="${basedir}/../../../project.properties"></property>
@@ -23,9 +23,10 @@
</fail>
</target>
-
+
<target name="delegate">
-
+ <available file="${avalon.buildsystem}/maven-common-gump-build.xml"
+ property="avalon.buildsystem.available"></available>
<antcall target="need-for-common-build"></antcall>
<ant inheritRefs="true" target="avalon:${target}" antfile="${avalon.buildsystem}/maven-common-gump-build.xml" inheritAll="true"></ant>
@@ -56,4 +57,3 @@
</target>
</project>
-
\ No newline at end of file
1.2 +4 -4 avalon/fortress/cli/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon/fortress/cli/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 9 Jun 2003 15:27:44 -0000 1.1
+++ build.xml 11 Jun 2003 08:19:17 -0000 1.2
@@ -5,7 +5,7 @@
<property file="${basedir}/project.properties"></property>
-
+
<property file="${basedir}/../project.properties"></property>
<property file="${basedir}/../../project.properties"></property>
<property file="${basedir}/../../../project.properties"></property>
@@ -23,9 +23,10 @@
</fail>
</target>
-
+
<target name="delegate">
-
+ <available file="${avalon.buildsystem}/maven-common-gump-build.xml"
+ property="avalon.buildsystem.available"></available>
<antcall target="need-for-common-build"></antcall>
<ant inheritRefs="true" target="avalon:${target}" antfile="${avalon.buildsystem}/maven-common-gump-build.xml" inheritAll="true"></ant>
@@ -56,4 +57,3 @@
</target>
</project>
-
\ No newline at end of file
1.4 +1 -1 avalon/buildsystem/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/buildsystem/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 10 Jun 2003 18:25:44 -0000 1.3
+++ maven.xml 11 Jun 2003 08:19:17 -0000 1.4
@@ -460,7 +460,7 @@
<!-- defers to common buildfile -->
<target name="delegate">
- <ant:available file="$${avalon.buildsystem}/maven-common-gump-build.xml"
+ <available file="$${avalon.buildsystem}/maven-common-gump-build.xml"
property="avalon.buildsystem.available"/>
<antcall target="need-for-common-build"/>
1.2 +4 -4 avalon/fortress/container/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon/fortress/container/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 9 Jun 2003 15:27:41 -0000 1.1
+++ build.xml 11 Jun 2003 08:19:17 -0000 1.2
@@ -5,7 +5,7 @@
<property file="${basedir}/project.properties"></property>
-
+
<property file="${basedir}/../project.properties"></property>
<property file="${basedir}/../../project.properties"></property>
<property file="${basedir}/../../../project.properties"></property>
@@ -23,9 +23,10 @@
</fail>
</target>
-
+
<target name="delegate">
-
+ <available file="${avalon.buildsystem}/maven-common-gump-build.xml"
+ property="avalon.buildsystem.available"></available>
<antcall target="need-for-common-build"></antcall>
<ant inheritRefs="true" target="avalon:${target}" antfile="${avalon.buildsystem}/maven-common-gump-build.xml" inheritAll="true"></ant>
@@ -56,4 +57,3 @@
</target>
</project>
-
\ No newline at end of file
1.2 +6 -6 avalon/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon/framework/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 9 Jun 2003 15:34:33 -0000 1.1
+++ build.xml 11 Jun 2003 08:19:17 -0000 1.2
@@ -5,7 +5,7 @@
<property file="${basedir}/project.properties"></property>
-
+
<property file="${basedir}/../project.properties"></property>
<property file="${basedir}/../../project.properties"></property>
<property file="${basedir}/../../../project.properties"></property>
@@ -17,18 +17,19 @@
BUILD SYSTEM FAILURE!
===================================================================
-a required file, E:\home\lsimons\Documents\cvs\avalon-new\avalon-buildsystem/avalon-buildsystem/maven-common-gump-build.xml,
+a required file, ../avalon-buildsystem/avalon-buildsystem/maven-common-gump-build.xml,
cannot be found. Try setting the avalon.buildsystem property in
project.properties to the correct location.
</fail>
</target>
-
+
<target name="delegate">
-
+ <available file="${avalon.buildsystem}/maven-common-gump-build.xml"
+ property="avalon.buildsystem.available"></available>
<antcall target="need-for-common-build"></antcall>
- <ant inheritRefs="true" target="avalon:${target}" antfile="E:\home\lsimons\Documents\cvs\avalon-new\avalon-buildsystem/avalon-buildsystem/maven-common-gump-build.xml" inheritAll="true"></ant>
+ <ant inheritRefs="true" target="avalon:${target}" antfile="../avalon-buildsystem/avalon-buildsystem/maven-common-gump-build.xml" inheritAll="true"></ant>
</target>
<target name="warning">
@@ -56,4 +57,3 @@
</target>
</project>
-
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org