Browse Source

restoring files committed by mistake

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276067 13f79535-47bb-0310-9956-ffa450edef68
master
Antoine Levy-Lambert 21 years ago
parent
commit
3dd67df3bb
6 changed files with 22 additions and 36 deletions
  1. +1
    -4
      proposal/xdocs/build.xml
  2. +1
    -1
      proposal/xdocs/dvsl/build.xml
  3. BIN
      proposal/xdocs/dvsl/lib/velocity-dvsl-0.42.jar
  4. +1
    -9
      proposal/xdocs/dvsl/task.dvsl
  5. +18
    -18
      proposal/xdocs/src/org/apache/tools/ant/taskdefs/Property.xml
  6. +1
    -4
      proposal/xdocs/src/org/apache/tools/ant/taskdefs/SubAnt.xml

+ 1
- 4
proposal/xdocs/build.xml View File

@@ -408,10 +408,7 @@
<fileset dir="lib" includes="*.jar"/>
</path>
<path>
<!-- <fileset dir="${ant.home}/lib" includes="*.jar"/> -->
<fileset dir="../../lib" includes="*.jar"/>
<fileset dir="../../lib/optional" includes="*.jar"/>
<pathelement location="../../build/classes"/>
<fileset dir="${ant.home}/lib" includes="*.jar"/>
</path>
</path>



+ 1
- 1
proposal/xdocs/dvsl/build.xml View File

@@ -36,7 +36,7 @@
<dvsl basedir="${taskdocs.src}" destdir="${manual.dest}"
style="task.dvsl" extension=".html"
toolboxfile="toolbox.props"
includes="property/property.xml">
includes="**/*.xml">
<velconfig name="velocimacro.library" value="" />
</dvsl>
</target>


BIN
proposal/xdocs/dvsl/lib/velocity-dvsl-0.42.jar View File


+ 1
- 9
proposal/xdocs/dvsl/task.dvsl View File

@@ -463,7 +463,6 @@ $word.substring(0,1).toUpperCase()$word.substring(1)
</td>
<td bgcolor="#ffffff" height="1">
<font size="$source-font-size"><pre>$toolbox.htmlescape.getText( $node.value() )</pre></font>
#* *#$context.applyTemplates("*")
</td>
<td bgcolor="$source-color" width="1">
<img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
@@ -483,14 +482,7 @@ $word.substring(0,1).toUpperCase()$word.substring(1)
</table>
</div>
#end
#match("ant:*")
&lt;$node.name()
#foreach ( $item in $node.getAttributes() )
$item.=$qq$node.getAttributeValue($item)$qq
#end
&gt;
&lt;$node.name()/&gt;
#end


#match("table")
<table>


+ 18
- 18
proposal/xdocs/src/org/apache/tools/ant/taskdefs/Property.xml View File

@@ -1,5 +1,5 @@
<!-- property task -->
<external xmlns:ant="http://ant.apache.org">
<external>
<description>

<p>Sets a property (by name and value), or set of properties (from file or resource) in the project.</p>
@@ -26,23 +26,23 @@
</description>

<section anchor="examples" name="Examples">
<source>
<ant:property name="foo.dist" value="dist"/>
</source>
<source><![CDATA[
<property name="foo.dist" value="dist"/>
]]></source>
<p>sets the property <code>foo.dist</code> to the value &quot;dist&quot;.</p>
<source>
<ant:property file="foo.properties"/>
</source>
<source><![CDATA[
<property file="foo.properties"/>
]]></source>
<p>reads a set of properties from a file called &quot;foo.properties&quot;.</p>
<source>
<ant:property resource="foo.properties"/>
</source>
<source><![CDATA[
<property resource="foo.properties"/>
]]></source>
<p>reads a set of properties from a resource called &quot;foo.properties&quot;.</p>
<p>Note that you can reference a global properties file for all of your Ant
builds using the following:</p>
<source>
<ant:property file="${user.home}/.ant-global.properties"/>
</source>
<source><![CDATA[
<property file="${user.home}/.ant-global.properties"/>
]]></source>
<p>since the &quot;user.home&quot; property is defined by the Java virtual machine
to be your home directory. Where the &quot;user.home&quot; property resolves to in
the file system depends on the operating system version and the JVM implementation.
@@ -51,11 +51,11 @@ variants, this will most likely resolve to the user's directory in the &quot;Doc
and Settings&quot; folder. Older windows variants such as Windows 98/ME are less
predictable, as are other operating system/JVM combinations.</p>

<source>
<ant:property environment="env"/>
<ant:echo message="Number of Processors = ${env.NUMBER_OF_PROCESSORS}"/>
<ant:echo message="ANT_HOME is set to = ${env.ANT_HOME}"/>
</source>
<source><![CDATA[
<property environment="env">
<echo message="Number of Processors = ${env.NUMBER_OF_PROCESSORS}">
<echo message="ANT_HOME is set to = ${env.ANT_HOME}">
]]></source>
<p>reads the system environment variables and stores them in properties, prefixed with &quot;env&quot;.
Note that this only works on <em>select</em> operating systems.
Two of the values are shown being echoed.


+ 1
- 4
proposal/xdocs/src/org/apache/tools/ant/taskdefs/SubAnt.xml View File

@@ -26,10 +26,7 @@
</subsection>
</description>
<section anchor="examples" name="Examples">
<source><![CDATA[
shell-prompt> m4 foo.m4 > foo
]]></source>
<pre>
<pre>
&lt;project name="subant" default="subant1"&gt;
&lt;property name="build.dir" value="subant.build"/&gt;
&lt;target name="subant1"&gt;


Loading…
Cancel
Save