stephan 2003/03/22 07:05:39
Modified: . build.new.xml
src/targets compile-build.xml docs-build.xml
forrest-build.xml ide-build.xml init-build.xml
samples-build.xml test-build.xml validate-build.xml
webapp-build.xml
Log:
Using the <import> statement, which Ant 1.6+ offers. Solving load issues
by using the basedir property.
Revision Changes Path
1.2 +30 -57 cocoon-2.1/build.new.xml
Index: build.new.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.new.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.new.xml 21 Mar 2003 13:56:06 -0000 1.1
+++ build.new.xml 22 Mar 2003 15:05:38 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!DOCTYPE project [
-<!-- ===========================================================================
+<project default="webapp" basedir="." name="Apache Cocoon">
+<!-- ============================================================================
* =========================== *
| Apache Cocoon Build System |
@@ -8,62 +8,35 @@
CVS $Id$:
-============================================================================ -->
-
-<!-- ================== Krysalis Centipede targets =================== -->
-<!ENTITY init-targets SYSTEM "./src/targets/init-build.xml">
-<!ENTITY compile-targets SYSTEM "./src/targets/compile-build.xml">
-<!ENTITY validate-targets SYSTEM "./src/targets/validate-build.xml">
-<!ENTITY samples-targets SYSTEM "./src/targets/samples-build.xml">
-<!ENTITY webapp-targets SYSTEM "./src/targets/webapp-build.xml">
-<!ENTITY ide-targets SYSTEM "./src/targets/ide-build.xml">
-<!ENTITY test-targets SYSTEM "./src/targets/test-build.xml">
-<!ENTITY docs-targets SYSTEM "./src/targets/docs-build.xml">
-<!-- =================================================================== -->
-
-<!-- ====================== Forrest targets =========================== -->
-<!ENTITY forrest-targets SYSTEM "./src/targets/forrest-build.xml">
-<!-- =================================================================== -->
-
-]>
-
-<project default="webapp" basedir="." name="Apache Cocoon">
-
- <!-- ====================== Cocoon targets ============================ -->
-
- <!-- =================================================================== -->
- <!-- Initialization targets --> &init-targets;
- <!--<import file="src/targets/init-build.xml"/>-->
- <!-- =================================================================== -->
- <!-- Compile targets --> &compile-targets;
- <!--<import file="src/targets/compile-build.xml"/>-->
- <!-- =================================================================== -->
- <!-- Validation targets --> &validate-targets;
- <!--<import file="src/targets/validate-build.xml"/>-->
- <!-- =================================================================== -->
- <!-- Samples targets --> &samples-targets;
- <!--<import file="src/targets/samples-build.xml"/>-->
- <!-- =================================================================== -->
- <!-- Web application targets --> &webapp-targets;
- <!--<import file="src/targets/webapp-build.xml"/>-->
- <!-- =================================================================== -->
- <!-- IDE targets --> &ide-targets;
- <!--<import file="src/targets/ide-build.xml"/>-->
- <!-- =================================================================== -->
- <!-- Testcases targets --> &test-targets;
- <!--<import file="src/targets/test-build.xml"/>-->
- <!-- =================================================================== -->
- <!-- Documentation targets --> &docs-targets;
- <!--<import file="src/targets/docs-build.xml"/>-->
- <!-- =================================================================== -->
+=================================================================================
-->
+ <property name="targets" value="${basedir}/src/targets"/>
+ <!-- ====================== Cocoon targets ===================================
-->
- <!-- ====================== Forrest targets =========================== -->
-
- <!-- =================================================================== -->
- <!-- Forrest targets --> &forrest-targets;
- <!--<import file="src/targets/forrest-build.xml"/>-->
- <!-- =================================================================== -->
+ <!-- ==========================================================================
-->
+ <!-- Initialization targets --> <import file="${targets}/init-build.xml"/>
+ <!-- ==========================================================================
-->
+ <!-- Compile targets --> <import file="${targets}/compile-build.xml"/>
+ <!-- ==========================================================================
-->
+ <!-- Validation targets --> <import file="${targets}/validate-build.xml"/>
+ <!-- ========================================================================= -->
+ <!-- Samples targets --> <import file="${targets}/samples-build.xml"/>
+ <!-- ========================================================================= -->
+ <!-- Web application targets --> <import file="${targets}/webapp-build.xml"/>
+ <!-- ========================================================================= -->
+ <!-- IDE targets --> <import file="${targets}/ide-build.xml"/>
+ <!-- ========================================================================= -->
+ <!-- Testcases targets --> <import file="${targets}/test-build.xml"/>
+ <!-- ========================================================================= -->
+ <!-- Documentation targets --> <import file="${targets}/docs-build.xml"/>
+ <!-- ========================================================================= -->
+
+
+ <!-- ====================== Forrest targets ================================= -->
+
+ <!-- ========================================================================= -->
+ <!-- Forrest targets --> <import file="${targets}/forrest-build.xml"/>
+ <!-- ========================================================================= -->
</project>
1.2 +3 -3 cocoon-2.1/src/targets/compile-build.xml
Index: compile-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/compile-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compile-build.xml 21 Mar 2003 13:56:08 -0000 1.1
+++ compile-build.xml 22 Mar 2003 15:05:38 -0000 1.2
@@ -1,5 +1,5 @@
-<!--<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Apache Cocoon Targets">-->
+<?xml version="1.0"?>
+<project default="webapp" basedir="." name="Compile targets">
<!-- Compilation Targets =================================================== -->
<!-- compiles everything -->
@@ -158,4 +158,4 @@
target="compile"/>
</target>
-<!--</project>-->
+</project>
1.2 +3 -3 cocoon-2.1/src/targets/docs-build.xml
Index: docs-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/docs-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docs-build.xml 21 Mar 2003 13:56:08 -0000 1.1
+++ docs-build.xml 22 Mar 2003 15:05:38 -0000 1.2
@@ -1,5 +1,5 @@
-<!--<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Apache Cocoon Targets">-->
+<?xml version="1.0"?>
+<project default="webapp" basedir="." name="Documentation targets">
<!-- Documentation Targets ================================================= -->
<target name="prepare-docs" depends="blocks">
@@ -233,4 +233,4 @@
force="true"/>
</target>
-<!--</project>-->
+</project>
1.2 +3 -3 cocoon-2.1/src/targets/forrest-build.xml
Index: forrest-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/forrest-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forrest-build.xml 21 Mar 2003 13:56:08 -0000 1.1
+++ forrest-build.xml 22 Mar 2003 15:05:38 -0000 1.2
@@ -1,5 +1,5 @@
-<!--<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Apache Cocoon Targets">-->
+<?xml version="1.0"?>
+<project default="webapp" basedir="." name="Apache Forrest targets">
<target name="forrest" depends="prepare, forrest.init" description="Generates
static HTML documentation">
<ant antfile="${forrest.home}/forrest.antproxy.xml" target="site"/>
@@ -140,4 +140,4 @@
<fail message="Need to define $${forrest.home}"/>
</target>
-<!--</project>-->
+</project>
1.2 +3 -3 cocoon-2.1/src/targets/ide-build.xml
Index: ide-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/ide-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ide-build.xml 21 Mar 2003 13:56:08 -0000 1.1
+++ ide-build.xml 22 Mar 2003 15:05:38 -0000 1.2
@@ -1,5 +1,5 @@
-<!--<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Apache Cocoon Targets">-->
+<?xml version="1.0"?>
+<project default="webapp" basedir="." name="IDE targets">
<!-- IDE targets =========================================================== -->
<!-- Generate the Emacs JDE project file -->
@@ -124,4 +124,4 @@
</copy>
</target>
-<!--</project>-->
+</project>
1.2 +3 -3 cocoon-2.1/src/targets/init-build.xml
Index: init-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/init-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- init-build.xml 21 Mar 2003 13:56:08 -0000 1.1
+++ init-build.xml 22 Mar 2003 15:05:38 -0000 1.2
@@ -1,5 +1,5 @@
-<!--<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Apache Cocoon Targets">-->
+<?xml version="1.0"?>
+<project default="webapp" basedir="." name="Initialization targets">
<!-- Initialization Targets ================================================ -->
<target name="init">
@@ -220,4 +220,4 @@
<delete dir="${dist.root}"/>
</target>
-<!--</project>-->
+</project>
1.2 +3 -3 cocoon-2.1/src/targets/samples-build.xml
Index: samples-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/samples-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samples-build.xml 21 Mar 2003 13:56:08 -0000 1.1
+++ samples-build.xml 22 Mar 2003 15:05:39 -0000 1.2
@@ -1,5 +1,5 @@
-<!--<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Apache Cocoon Targets">-->
+<?xml version="1.0"?>
+<project default="webapp" basedir="." name="Sample targets">
<!-- Samples Targets ======================================================= -->
<target name="samples" depends="prepare, init-xpatch"
unless="unless.exclude.webapp.samples">
@@ -74,4 +74,4 @@
target="samples"/>
</target>
-<!--</project>-->
+</project>
1.2 +3 -3 cocoon-2.1/src/targets/test-build.xml
Index: test-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/test-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test-build.xml 21 Mar 2003 13:56:08 -0000 1.1
+++ test-build.xml 22 Mar 2003 15:05:39 -0000 1.2
@@ -1,5 +1,5 @@
-<!--<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Apache Cocoon Targets">-->
+<?xml version="1.0"?>
+<project default="webapp" basedir="." name="Test targets">
<!-- Test targets =========================================================== -->
<!-- Runs all tests -->
@@ -71,4 +71,4 @@
-->
</target>
-<!--</project>-->
+</project>
1.2 +3 -3 cocoon-2.1/src/targets/validate-build.xml
Index: validate-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/validate-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- validate-build.xml 21 Mar 2003 13:56:08 -0000 1.1
+++ validate-build.xml 22 Mar 2003 15:05:39 -0000 1.2
@@ -1,5 +1,5 @@
-<!--<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Apache Cocoon Targets">-->
+<?xml version="1.0"?>
+<project default="webapp" basedir="." name="Validation targets">
<!-- Validation targets ==================================================== -->
<!-- Check if all the JAR files are properly declared in lib/jars.xml -->
@@ -71,4 +71,4 @@
</jing>-->
</target>
-<!--</project>-->
+</project>
1.2 +3 -3 cocoon-2.1/src/targets/webapp-build.xml
Index: webapp-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/webapp-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- webapp-build.xml 21 Mar 2003 13:56:08 -0000 1.1
+++ webapp-build.xml 22 Mar 2003 15:05:39 -0000 1.2
@@ -1,5 +1,5 @@
-<!--<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Apache Cocoon Targets">-->
+<?xml version="1.0"?>
+<project default="webapp" basedir="." name="Web application targets">
<!-- Webapp targets ==================================================== -->
<target name="prepare-webapp" depends="blocks, package">
@@ -139,4 +139,4 @@
</jar>
</target>
-<!--</project>-->
+</project>
