stefano 2003/04/01 13:50:03
Modified: . gump.xml build.xml
Log:
added a new gump target for scratchpad and refactored some dependencies around
Revision Changes Path
1.28 +63 -38 cocoon-2.1/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/gump.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gump.xml 30 Mar 2003 12:00:31 -0000 1.27
+++ gump.xml 1 Apr 2003 21:50:03 -0000 1.28
@@ -21,7 +21,7 @@
<project name="cocoon">
<package>org.apache.cocoon</package>
- <ant target="gump">
+ <ant target="gump-core">
<property name="version" value="@@DATE@@"/>
<depend property="logkit.jar" project="dist-avalon-logkit"/>
<depend property="avalonapi.jar" project="avalon"/>
@@ -55,18 +55,16 @@
<depend project="commons-jxpath" version="supplied"/>
<depend project="jdom" version="supplied"/>
- <depend project="castor" version="supplied"/>
<depend project="rhino-cocoondev" version="supplied"/>
<depend project="jisp" version="supplied"/>
<depend project="jaxen" inherit="runtime"/>
+
<depend project="jing"/>
<depend project="jstyle"/>
- <depend project="pizza"/>
+ <!--depend project="pizza"/-->
<depend project="junit"/>
<depend project="eclipse-jtd"/>
- <option project="xml-axis" version="supplied"/>
-
<work nested="build/cocoon-@@DATE@@/classes"/>
<work nested="tools/anttasks"/>
<work nested="tools/loader"/>
@@ -74,6 +72,7 @@
<home nested="build/cocoon-@@DATE@@"/>
<jar name="cocoon.jar"/>
+ <jar name="cocoon-deprecated.jar"/>
<javadoc parent="build/cocoon-@@DATE@@/javadocs"/>
@@ -82,6 +81,31 @@
</nag>
</project>
+ <!--
+ *************************************
+ ******** COCOON SCRATCHPAD ********
+ *************************************
+ -->
+
+ <project name="cocoon-scratchpad">
+ <package>org.apache.cocoon</package>
+
+ <ant target="gump-scratchpad">
+ <property name="version" value="@@DATE@@"/>
+ </ant>
+
+ <depend project="cocoon" inherit="all"/>
+ <depend project="castor" version="supplied"/>
+ <depend project="common-jexel" version="supplied"/>
+
+ <work nested="tools/anttasks"/>
+ <home nested="build/cocoon-@@DATE@@"/>
+
+ <jar name="cocoon-scratchpad.jar"/>
+
+ <nag from="Gump" to="[EMAIL PROTECTED]"/>
+ </project>
+
<!--
********************************************
******** COCOON BLOCKS ********
@@ -91,7 +115,7 @@
<project name="cocoon-block-fop">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="fop"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -110,7 +134,7 @@
<project name="cocoon-block-batik">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="batik"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -129,7 +153,7 @@
<project name="cocoon-block-chaperon">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="chaperon"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -148,7 +172,7 @@
<project name="cocoon-block-swf">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="swf"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -167,7 +191,7 @@
<project name="cocoon-block-jfor">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="jfor"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -185,7 +209,7 @@
<project name="cocoon-block-itext">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="itext"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -205,7 +229,7 @@
<project name="cocoon-block-session-fw">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="session-fw"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -223,7 +247,7 @@
<project name="cocoon-block-authentication-fw">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="authentication-fw"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -242,7 +266,7 @@
<project name="cocoon-block-portal-fw">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="portal-fw"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -262,7 +286,7 @@
<project name="cocoon-block-databases">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="databases"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -282,7 +306,7 @@
<project name="cocoon-block-hsqldb">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="hsqldb"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -302,12 +326,13 @@
<project name="cocoon-block-precept" status="unstable">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="precept"/>
<property name="version" value="@@DATE@@"/>
</ant>
<depend project="cocoon" inherit="all"/>
+ <depend project="castor" version="supplied"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -320,7 +345,7 @@
<project name="cocoon-block-poi">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="poi"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -339,7 +364,7 @@
<project name="cocoon-block-naming">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="naming"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -358,7 +383,7 @@
<project name="cocoon-block-jsp">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="jsp"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -377,7 +402,7 @@
<project name="cocoon-block-php">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="php"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -396,7 +421,7 @@
<project name="cocoon-block-python">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="python"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -415,7 +440,7 @@
<project name="cocoon-block-lucene">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="lucene"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -434,7 +459,7 @@
<project name="cocoon-block-html">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="html"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -453,7 +478,7 @@
<project name="cocoon-block-bsf">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="bsf"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -472,7 +497,7 @@
<project name="cocoon-block-profiler">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="profiler"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -490,7 +515,7 @@
<project name="cocoon-block-velocity">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="velocity"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -509,7 +534,7 @@
<project name="cocoon-block-linkrewriter">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="linkrewriter"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -527,7 +552,7 @@
<project name="cocoon-block-web3">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="web3"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -548,7 +573,7 @@
<project name="cocoon-block-slide">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="slide"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -569,7 +594,7 @@
<project name="cocoon-block-proxy" status="unstable">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="proxy"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -589,7 +614,7 @@
<project name="cocoon-block-xmldb">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="xmldb"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -609,7 +634,7 @@
<project name="cocoon-block-deli">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="deli"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -628,7 +653,7 @@
<project name="cocoon-block-asciiart" status="unstable">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="asciiart"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -646,7 +671,7 @@
<project name="cocoon-block-mail" status="unstable">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="mail"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -666,7 +691,7 @@
<project name="cocoon-block-axis" status="unstable">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="axis"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -685,7 +710,7 @@
<project name="cocoon-block-taglib" status="unstable">
<package>org.apache.cocoon</package>
- <ant target="block">
+ <ant target="gump-block">
<property name="block-name" value="taglib"/>
<property name="version" value="@@DATE@@"/>
</ant>
1.30 +4 -2 cocoon-2.1/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 28 Mar 2003 00:28:09 -0000 1.29
+++ build.xml 1 Apr 2003 21:50:03 -0000 1.30
@@ -20,6 +20,7 @@
<!ENTITY test-targets SYSTEM "./src/targets/test-build.xml">
<!ENTITY docs-targets SYSTEM "./src/targets/docs-build.xml">
<!ENTITY dist-targets SYSTEM "./src/targets/dist-build.xml">
+ <!ENTITY admin-targets SYSTEM "./src/targets/admin-build.xml">
<!-- =================================================================== -->
<!-- ================== Apache Forrest targets ======================= -->
@@ -51,7 +52,8 @@
<!-- =================================================================== -->
<!-- Distribution targets --> &dist-targets;
<!-- =================================================================== -->
-
+ <!-- Administration targets --> &admin-targets;
+ <!-- =================================================================== -->
<!-- ================== Apache Forrest targets ======================= -->
