nicolaken 2002/11/28 15:34:32
Modified: . build.xml changes.xml
src/documentation/xdocs/installing index.xml
Removed: tools build-i.xml build-s.xml
src/scratchpad/builds castor.xml
Log:
<action dev="NKB" type="update">
Removed ./tools/build-i.xml and moved the interactive targets in main build.
Removed ./tools/build-s.xml and removed all references to scratchpad builds (not
used).
</action>
Revision Changes Path
1.287 +44 -14 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- build.xml 28 Nov 2002 20:26:39 -0000 1.286
+++ build.xml 28 Nov 2002 23:34:32 -0000 1.287
@@ -260,9 +260,52 @@
</target>
<!-- =================================================================== -->
- <!-- Trial builds - begin -->
+ <!-- Interactive build -->
<!-- =================================================================== -->
+
+ <target name="i" description="Interactive Build" depends="interactive"/>
+
+ <target name="interactive" description="Interactive Build">
+ <echo message=" "/>
+ <echo message="--------------------------------------------------------------"/>
+ <echo message=" "/>
+ <echo message=" APACHE COCOON "/>
+ <echo message=" "/>
+ <echo message="--------------------------------------------------------------"/>
+ <echo message="Building with ${ant.version}"/>
+ <echo message="using build file ${ant.file}"/>
+ <echo message="--------------------------------------------------------------"/>
+ <echo message=" "/>
+ <echo message=" These are the most common build targets."/>
+ <echo message=" You can also invoke them directly; see build.xml for more info.
"/>
+ <echo message=" "/>
+ <echo message=" installwar ------ installs war package"/>
+ <echo message=" installscratchpadwar --- also with scratchpad stuff"/>
+ <echo message=" docs ------------ generates the docs"/>
+ <echo message=" validate-xdocs -- validation of all core XML documentation"/>
+ <echo message=" javadocs -------- generates the API documentation"/>
+ <echo message=" printer-docs ---- generates the printer friendly docs"/>
+ <echo message=" test ------------ performes all the tests"/>
+ <echo message=" compile --------- compiles the source code "/>
+ <echo message=" webapp-local ---- local webapp context dir for quick turn
around"/>
+ <echo message=" clean ----------- cleans the build directory"/>
+ <echo message=" "/>
+ <echo message=" "/>
+
+ <!-- Ask the user for the destination path for the war -->
+ <input message="Please select a target"
+ addproperty="input.selection"/>
+
+ <!-- If he hits enter, abort -->
+ <condition property="do.abort">
+ <equals arg1="" arg2="${input.selection}" />
+ </condition>
+ <fail if="do.abort">Build aborted by user.</fail>
+
+ <antcall target="${input.selection}"/>
+ </target>
+
<!-- =================================================================== -->
<!-- Try other builds that could go into this core build -->
<!-- =================================================================== -->
@@ -271,15 +314,6 @@
</target>
<!-- =================================================================== -->
- <!-- Scratchpad build (see also installscratchpadwar target) -->
- <!-- =================================================================== -->
- <target name="scratchpad" depends="init"
- description="Interactive scratchpad builds">
- <ant target="scratchpad-init" antfile="tools/build-s.xml"
- inheritRefs="true" />
- </target>
-
- <!-- =================================================================== -->
<!-- Installs Cocoon war file in a specified directory -->
<!-- =================================================================== -->
<target name="installwar" depends="init"
@@ -328,10 +362,6 @@
<antcall target="install"/>
</target>
- <!-- =================================================================== -->
- <!-- Trial builds - end -->
- <!-- =================================================================== -->
-
<!-- =================================================================== -->
<!-- Test for optional components -->
<!-- =================================================================== -->
1.294 +5 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- changes.xml 28 Nov 2002 20:28:20 -0000 1.293
+++ changes.xml 28 Nov 2002 23:34:32 -0000 1.294
@@ -41,6 +41,10 @@
<release version="@version@" date="@date@">
<action dev="NKB" type="update">
+ Removed ./tools/build-i.xml and moved the interactive targets in main build.
+ Removed ./tools/build-s.xml and removed all references to scratchpad builds
(not used).
+ </action>
+ <action dev="NKB" type="update">
Removed JTidyTask that was not used and switched to using the Ant input task
from UserInputTask.
</action>
<action dev="NKB" type="fix" fixes-bug="14795">
1.32 +3 -32 xml-cocoon2/src/documentation/xdocs/installing/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/installing/index.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- index.xml 1 Aug 2002 02:19:24 -0000 1.31
+++ index.xml 28 Nov 2002 23:34:32 -0000 1.32
@@ -396,7 +396,7 @@
<note>Available in interactive build.</note>
</s4>
- <s4 title="[BETA] build interactive">
+ <s4 title="build interactive">
<p>Shows common build targets and asks the user for eventual
properties that may be needed.
</p>
@@ -404,16 +404,9 @@
<ul>
<li><strong>target:</strong> interactive</li>
<li><strong>required properties:</strong> none - asks if needed</li>
- <li><strong>buildfile:</strong> tools/build-i.xml</li>
+ <li><strong>buildfile:</strong> build.xml</li>
</ul>
- <p>To do this you simply have to type:</p>
-
- <source>
-[unix] ./build.sh -buildfile tools/build-i.xml
-[win32] .\build.bat -buildfile tools/build-i.xml
- </source>
-
<note>This is the recommended target for first-time users.</note>
</s4>
@@ -574,28 +567,6 @@
version of Cocoon which you can find in the CVS. </p>
</s4>
- <s4 title="[BETA] build scratchpad">
- <p>An interactive build to help alpha-testers in installing
- cutting-edge code.
- </p>
-
- <ul>
- <li><strong>target:</strong> scratchpad</li>
- <li><strong>required properties:</strong> none</li>
- <li><strong>buildfile:</strong> tools/build-s.xml</li>
- </ul>
-
- <p>To do this you simply have to type:</p>
-
-<source>
-[unix] ./build.sh -buildfile tools/build-s.xml
-[win32] .\build.bat -buildfile tools/build-s.xml</source>
-
- <note><strong>WARNING:</strong> Scratchpad builds are <strong>not
guaranteed to work</strong>.
- You have been warned.
- </note>
- </s4>
-
<s4 title="[BETA] build try">
<p>Makes it possible to try new build targets that have not yet made
it into the core build. These targets are in tools/builds/try.xml.
@@ -613,7 +584,7 @@
[unix] ./build.sh try -Dtry.target=test-target
[win32] .\build.bat try -Dtry.target=test-target</source>
- <note>Targets are in tools/build-i.xml.</note>
+ <note>Targets are in tools/build-t.xml.</note>
</s4>
</s3>
</s2>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
