stephan 2003/03/22 09:02:19
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 entities to aggregate target files instead of import statements.
Revision Changes Path
1.4 +49 -30 cocoon-2.1/build.new.xml
Index: build.new.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.new.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.new.xml 22 Mar 2003 16:46:38 -0000 1.3
+++ build.new.xml 22 Mar 2003 17:02:18 -0000 1.4
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Apache Cocoon">
-<!-- ============================================================================
+<!DOCTYPE project [
+<!-- ===========================================================================
* =========================== *
| Apache Cocoon Build System |
@@ -8,35 +8,54 @@
CVS $Id$:
-=================================================================================
-->
+============================================================================ -->
+
+ <!-- ================== Apache Cocoon 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">
+ <!-- =================================================================== -->
+
+ <!-- ================== Apache Forrest targets ======================= -->
+ <!ENTITY forrest-targets SYSTEM "./src/targets/forrest-build.xml">
+ <!-- =================================================================== -->
+
+]>
+
+<project default="webapp" basedir="." name="Apache Cocoon">
+
+ <!-- ================== Apache Cocoon targets ======================== -->
- <property name="targets" value="${basedir}/src/targets"/>
+ <!-- =================================================================== -->
+ <!-- Initialization targets --> &init-targets;
+ <!-- =================================================================== -->
+ <!-- Compile targets --> &compile-targets;
+ <!-- =================================================================== -->
+ <!-- Validation targets --> &validate-targets;
+ <!-- =================================================================== -->
+ <!-- Samples targets --> &samples-targets;
+ <!-- =================================================================== -->
+ <!-- Web application targets --> &webapp-targets;
+ <!-- =================================================================== -->
+ <!-- IDE targets --> &ide-targets;
+ <!-- =================================================================== -->
+ <!-- Testcases targets --> &test-targets;
+ <!-- =================================================================== -->
+ <!-- Documentation targets --> &docs-targets;
+ <!-- =================================================================== -->
- <!-- ====================== Cocoon targets ===================================
-->
- <!-- ==========================================================================
-->
- <!-- 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"/>
- <!-- ==========================================================================
-->
+
+ <!-- ================== Apache Forrest targets ======================= -->
+
+ <!-- =================================================================== -->
+ <!-- Forrest targets --> &forrest-targets;
+ <!-- =================================================================== -->
</project>
+
1.4 +0 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- compile-build.xml 22 Mar 2003 16:46:38 -0000 1.3
+++ compile-build.xml 22 Mar 2003 17:02:18 -0000 1.4
@@ -1,5 +1,3 @@
-<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Compile targets">
<!-- Compilation Targets =================================================== -->
<!-- compiles everything -->
@@ -164,4 +162,3 @@
target="compile"/>
</target>
-</project>
1.3 +0 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docs-build.xml 22 Mar 2003 15:05:38 -0000 1.2
+++ docs-build.xml 22 Mar 2003 17:02:18 -0000 1.3
@@ -1,5 +1,3 @@
-<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Documentation targets">
<!-- Documentation Targets ================================================= -->
<target name="prepare-docs" depends="blocks">
@@ -233,4 +231,3 @@
force="true"/>
</target>
-</project>
1.3 +1 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- forrest-build.xml 22 Mar 2003 15:05:38 -0000 1.2
+++ forrest-build.xml 22 Mar 2003 17:02:18 -0000 1.3
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Apache Forrest targets">
+ <!-- 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 +139,3 @@
<fail message="Need to define $${forrest.home}"/>
</target>
-</project>
1.3 +0 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ide-build.xml 22 Mar 2003 15:05:38 -0000 1.2
+++ ide-build.xml 22 Mar 2003 17:02:18 -0000 1.3
@@ -1,5 +1,3 @@
-<?xml version="1.0"?>
-<project default="webapp" basedir="." name="IDE targets">
<!-- IDE targets =========================================================== -->
<!-- Generate the Emacs JDE project file -->
@@ -124,4 +122,3 @@
</copy>
</target>
-</project>
1.4 +0 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- init-build.xml 22 Mar 2003 16:46:38 -0000 1.3
+++ init-build.xml 22 Mar 2003 17:02:18 -0000 1.4
@@ -1,5 +1,3 @@
-<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Initialization targets">
<!-- Initialization Targets ================================================ -->
<target name="init">
@@ -214,4 +212,3 @@
<delete dir="${dist.root}"/>
</target>
-</project>
1.3 +0 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- samples-build.xml 22 Mar 2003 15:05:39 -0000 1.2
+++ samples-build.xml 22 Mar 2003 17:02:18 -0000 1.3
@@ -1,5 +1,3 @@
-<?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 +72,3 @@
target="samples"/>
</target>
-</project>
1.3 +0 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test-build.xml 22 Mar 2003 15:05:39 -0000 1.2
+++ test-build.xml 22 Mar 2003 17:02:18 -0000 1.3
@@ -1,5 +1,3 @@
-<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Test targets">
<!-- Test targets =========================================================== -->
<!-- Runs all tests -->
@@ -71,4 +69,3 @@
-->
</target>
-</project>
1.3 +0 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- validate-build.xml 22 Mar 2003 15:05:39 -0000 1.2
+++ validate-build.xml 22 Mar 2003 17:02:18 -0000 1.3
@@ -1,5 +1,3 @@
-<?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 +69,3 @@
</jing>-->
</target>
-</project>
1.3 +0 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- webapp-build.xml 22 Mar 2003 15:05:39 -0000 1.2
+++ webapp-build.xml 22 Mar 2003 17:02:18 -0000 1.3
@@ -1,5 +1,3 @@
-<?xml version="1.0"?>
-<project default="webapp" basedir="." name="Web application targets">
<!-- Webapp targets ==================================================== -->
<target name="prepare-webapp" depends="blocks, package">
@@ -139,4 +137,3 @@
</jar>
</target>
-</project>
