diff options
-rwxr-xr-x | bootstrap.bat | 2 | ||||
-rwxr-xr-x | bootstrap.sh | 2 | ||||
-rwxr-xr-x | build.bat | 2 | ||||
-rwxr-xr-x | build.sh | 2 | ||||
-rw-r--r-- | docs/manual/OptionalTasks/replaceregexp.html | 116 | ||||
-rw-r--r-- | docs/manual/optionaltasklist.html | 1 |
6 files changed, 121 insertions, 4 deletions
diff --git a/bootstrap.bat b/bootstrap.bat index 120c085ff..b239b551f 100755 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -23,7 +23,7 @@ if not "%OS%" == "Windows_NT" if exist bootstrap\nul deltree/y bootstrap if "%OS%" == "Windows_NT" if exist build\classes\nul rmdir/s/q build\classes if not "%OS%" == "Windows_NT" if exist build\classes\nul deltree/y build\classes -SET LOCALCLASSPATH=lib\crimson.jar;lib\jaxp.jar; +SET LOCALCLASSPATH=lib\crimson.jar for %%i in (lib\optional\*.jar) do call src\script\lcp.bat %%i if exist "%JAVA_HOME%\lib\tools.jar" call src\script\lcp.bat %JAVA_HOME%\lib\tools.jar if exist "%JAVA_HOME%\lib\classes.zip" call src\script\lcp.bat %JAVA_HOME%\lib\classes.zip diff --git a/bootstrap.sh b/bootstrap.sh index 81bdc9898..5830a082c 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -68,7 +68,7 @@ if [ -d "build/classes" ] ; then rm -r build/classes fi -CLASSPATH=lib/crimson.jar:lib/jaxp.jar:${CLASSPATH} +CLASSPATH=lib/crimson.jar:${CLASSPATH} DIRLIBS=lib/optional/*.jar for i in ${DIRLIBS} @@ -10,7 +10,7 @@ echo Bootstrap FAILED goto cleanup :runAnt -set LOCALCLASSPATH=lib\crimson.jar;lib\jaxp.jar;bootstrap\lib\ant.jar +set LOCALCLASSPATH=lib\crimson.jar;bootstrap\lib\ant.jar for %%i in (lib\optional\*.jar) do call bootstrap\bin\lcp.bat %%i set CLASSPATH=lib\optional\xalanj1compat.jar;%LOCALCLASSPATH%;%CLASSPATH% set LOCALCLASSPATH= @@ -13,7 +13,7 @@ if test ! -f bootstrap/lib/ant.jar -o ! -x bootstrap/bin/ant -o ! -x bootstrap/ exit fi -LOCALCLASSPATH=lib/crimson.jar:lib/jaxp.jar +LOCALCLASSPATH=lib/crimson.jar # add in the dependency .jar files DIRLIBS=lib/optional/*.jar for i in ${DIRLIBS} diff --git a/docs/manual/OptionalTasks/replaceregexp.html b/docs/manual/OptionalTasks/replaceregexp.html new file mode 100644 index 000000000..b867e3fa1 --- /dev/null +++ b/docs/manual/OptionalTasks/replaceregexp.html @@ -0,0 +1,116 @@ +<html> + +<head> +<meta http-equiv="Content-Language" content="en-us"> +<title>Ant User Manual</title> +</head> + +<body> + +<h2><a name="replace">ReplaceRegExp</a></h2> +<h3>Description</h3> +<p>ReplaceRegExp is a directory based task for replacing the +occurrence of a given regular expression with a substitution pattern +in a selected file or set of files.</p> + +<p>Similar to <a href="../CoreTypes/mapper.html#regexp-mapper">regexp +type mappers</a> this task needs a supporting regular expression +library and an implementation of +<code>org.apache.tools.ant.util.regexp.Regexp</code>. Ant comes with +implementations for +<a href="http://java.sun.com/j2se/1.4/docs/api/java/util/regex/package-summary.html" target="_top">the java.util.regex package of JDK 1.4</a>, +<a href="http://jakarta.apache.org/regexp/" target="_top">jakarta-regexp</a> +and <a href="http://jakarta.apache.org/oro/" target="_top">jakarta-ORO</a>, +but you will still need the library itself.</p> + +<h3>Parameters</h3> +<table border="1" cellpadding="2" cellspacing="0"> + <tr> + <td valign="top"><b>Attribute</b></td> + <td valign="top"><b>Description</b></td> + <td align="center" valign="top"><b>Required</b></td> + </tr> + <tr> + <td valign="top">file</td> + <td valign="top">file for which the regular expression should be replaced.</td> + <td align="center">Yes if no nested <fileset> is used</td> + </tr> + <tr> + <td valign="top">match</td> + <td valign="top">The regular expression pattern to match in the file(s)</td> + <td align="center">Yes, if no nested <regularexpression> is used</td> + </tr> + <tr> + <td valign="top">replace</td> + <td valign="top">The substition pattern to place in the file(s) in place + of the regular expression.</td> + <td align="center">Yes, if no nested <substitution> is used</td> + </tr> + <tr> + <td valign="top">flags</td> + <td valign="top">The flags to use when matching the regular expression. For more + information, consult the Perl5 syntax<br /> + g --> Global replacement. Replace all occurances found<br /> + i --> Case Insensitive. Do not consider case in the match<br /> + m --> Multiline. Treat the string as multiple lines of input, using "^" and "$" as the start or end of any line, respectively, rather than start or end of string.<br /> + s --> Singleline. Treat the string as a single line of input, using "." to match any character, including a newline, which normally, it would not match.<br /> + <td valign="top" align="center">No</td> + </tr> + <tr> + <td valign="top">byline</td> + <td valign="top">Process the file(s) one line at a time, executing the replacement + on one line at a time (<i>true/false</i>). This is useful if you + want to only replace the first occurance of a regular expression on + each line, which is not easy to do when processing the file as a whole. + Defaults to <i>false</i>.</td> + <td valign="top" align="center">No</td> + </tr> +</table> +<h3>Examples</h3> +<pre> <replaceregexp file="${src}/build.properties" + match="OldProperty=(.*)" + replace="NewProperty=\1" + byline="true" /> +</pre> +<p>replaces occurrences of the property name "OldProperty" + with "NewProperty" in a properties file, preserving the existing +value, in the file <code>${src}/build.properties</code></p> +<h3>Parameters specified as nested elements</h3> +<p>This task supports a nested <a href="../CoreTypes/fileset.html">FileSet</a> + element.</p> +<p>This task supports a nested <i>RegularExpression</i> element to specify + the regular expression. You can use this element to refer to a previously + defined regular expression datatype instance.</p> +<blockquote> + <regularexpression id="id" pattern="expression" /><br /> + <regularexpression refid="id" /> +</blockquote> +<p>This task supports a nested <i>Substitution</i> element to specify + the substitution pattern. You can use this element to refer to a previously + defined substition pattern datatype instance.</p> +<blockquote> + <substitution id="id" pattern="expression" /><br /> + <substitution refid="id" /> +</blockquote> +<h3>Examples</h3> +<blockquote> + <pre> +<replaceregexp byline="true"> + <regularexpression expression="OldProperty=(.*)" /> + <substitution expression="NewProperty=\1" /> + <fileset dir="."> + <includes="*.properties" /> + </fileset> + </replaceregexp> +</pre></blockquote> +<p>replaces occurrences of the property name "OldProperty" + with "NewProperty" in a properties file, preserving the existing +value, in all files ending in <code>.properties</code> in the current directory</p> + +<hr> +<p align="center">Copyright © 2000,2001 Apache Software Foundation. All rights +Reserved.</p> + +</body> +</html> + diff --git a/docs/manual/optionaltasklist.html b/docs/manual/optionaltasklist.html index f3e50db99..22f1bb326 100644 --- a/docs/manual/optionaltasklist.html +++ b/docs/manual/optionaltasklist.html @@ -39,6 +39,7 @@ <a href="OptionalTasks/propertyfile.html">PropertyFile</a><br> <a href="OptionalTasks/pvcstask.html">Pvcs</a><br> <a href="OptionalTasks/renameextensions.html"><i>RenameExtensions</i></a><br> +<a href="OptionalTasks/replaceregexp.html">ReplaceRegExp</a><br> <a href="OptionalTasks/rpm.html">Rpm</a><br> <a href="OptionalTasks/script.html">Script</a><br> <a href="OptionalTasks/sound.html">Sound</a><br> |