Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r169 - trunk: . src/docs/manual src/ise/antelope/common src/ise/antelope/tasks

antelope
Discussion topic

Hide all messages in topic

All messages in topic

svn commit: r169 - trunk: . src/docs/manual src/ise/antelope/common src/ise/antelope/tasks

Author danson
Full name Dale Anson
Date 2010-08-26 12:36:48 PDT
Message Author: danson
Date: 2010-08-26 12:36:47-0700
New Revision: 169

Modified:
   trunk/build-tasks.xml
   trunk/build.props
   trunk/src/docs/manual/tasks.xml
   trunk/src/ise/antelo​pe/common/version.tx​t
   trunk/src/ise/antelo​pe/tasks/Find.java

Log:
Fix for issue #48, added "quiet" parameter to Find task.

Modified: trunk/build-tasks.xml
Url: http://antelope.tigr​is.org/source/browse​/antelope/trunk/buil​d-tasks.xml?view=dif​f&pathrev=169​&r1=168&r2=169
====================​====================​====================​==================
--- trunk/build-tasks.xml (original)
+++ trunk/build-tasks.xml 2010-08-26 12:36:47-0700
@@ -44,6 +44,8 @@
 
     <!-- where to put the finished distribution file -->
     <property name="dist.dir" location="dist"/>
+
+ <property name="docbookx.dtd" value="${src.dir}/d​ocs/docbookx.dtd"/​>
 
 
 
@@ -100,7 +102,7 @@
    ====================​====================​====================​============= -->
     <target name="dist"
             description="Compiles, jars, puts the jar in the jEdit jars directory."
- depends="jar">
+ depends="jar,docs-xalan">
 
         <!-- zip the jar and installation instructions and put the zip file in
         the $dist directory -->
@@ -171,12 +173,20 @@
             <fileset dir="${src.dir}/docs/manual" includes="**/*.css" />
         </copy>
 
- <style basedir="${src.dir}​/docs/manual"
- style="${src.dir}/d​ocs/users-guide.xsl"​
- destdir="${doc.dir}/manual"
- includes="userguide.xml">
- <param name="html.stylesheet" expression="./style.css"/>
- </style>
+ <xslt basedir="${src.dir}​/docs/manual"
+ destdir="${doc.dir}/manual"
+ style="${src.dir}/d​ocs/users-guide.xsl"​
+ includes="userguide.xml">
+ <xmlcatalog>
+ <dtd publicId="-//OASIS//DTD DocBook XML V4.2//EN"
+ location="${docbookx.dtd}" />
+ </xmlcatalog>
+ </xslt>
+ <!-- insert the style sheet -->
+ <replace dir="${doc.dir}/manual" encoding="ISO-8859-1">
+ <replacefilter token="@style@"
+ value="&lt;STYLE TYPE=&quot;text/​css&quot;&gt​; &lt;!-- @import url(./style.css); --&gt; &lt;/STYLE&gt;" />
+ </replace>
     </target>
 
 
@@ -242,7 +252,6 @@
         <tstamp/>
         <replace dir="${prep.dir}" token="@@tstamp@@"
                 value="${TODAY}" />
-
     </target>
 
    <!-- ====================​====================​====================​============

Modified: trunk/build.props
Url: http://antelope.tigr​is.org/source/browse​/antelope/trunk/buil​d.props?view=diff​&pathrev=169&r1​=168&r2=169
====================​====================​====================​==================
--- trunk/build.props (original)
+++ trunk/build.props 2010-08-26 12:36:47-0700
@@ -10,7 +10,7 @@
 #docbookx.dtd=file:/​//C:/cygwin/usr/shar​e/docbook-xml42/docb​ookx.dtd
 
 install.dir=${user.​home}/.jedit/jars
-build.num=3.5.1
+build.num=3.5.3
 
 # optional settings, remove if you don't use jikes
 #build.compiler=jikes

Modified: trunk/src/docs/manual/tasks.xml
Url: http://antelope.tigr​is.org/source/browse​/antelope/trunk/src/​docs/manual/tasks.xm​l?view=diff&path​rev=169&r1=168​&r2=169
====================​====================​====================​==================
--- trunk/src/docs/manual/tasks.xml (original)
+++ trunk/src/docs/manual/tasks.xml 2010-08-26 12:36:47-0700
@@ -3594,7 +3594,12 @@
 <entry>false​</entry>
 <entry>No</entry>
 </row>
-
+<row>
+<entry>quiet​</entry>
+<entry>Suppress log output.</entry>
+<entry>false​</entry>
+<entry>No</entry>
+</row>
 </tbody>
 </tgroup>
 </table>

Modified: trunk/src/ise/antelo​pe/common/version.tx​t
Url: http://antelope.tigr​is.org/source/browse​/antelope/trunk/src/​ise/antelope/common/​version.txt?view=dif​f&pathrev=169​&r1=168&r2=169
====================​====================​====================​==================
--- trunk/src/ise/antelo​pe/common/version.tx​t (original)
+++ trunk/src/ise/antelo​pe/common/version.tx​t 2010-08-26 12:36:47-0700
@@ -1,2 +1,2 @@
 VERSION=3.5.1
-DATE=May 18 2009
\ No newline at end of file
+DATE=August 26 2010
\ No newline at end of file

Modified: trunk/src/ise/antelo​pe/tasks/Find.java
Url: http://antelope.tigr​is.org/source/browse​/antelope/trunk/src/​ise/antelope/tasks/F​ind.java?view=diff​&pathrev=169&r​1=168&r2=169
====================​====================​====================​==================
--- trunk/src/ise/antelo​pe/tasks/Find.java (original)
+++ trunk/src/ise/antelo​pe/tasks/Find.java 2010-08-26 12:36:47-0700
@@ -26,6 +26,7 @@
     private boolean unixLines = false;
     private boolean allMatches = false;
     private String separator = System.getProperty("​line.separator");
+ private boolean quiet = false;
 
     /**
      * Where to look.
@@ -142,6 +143,15 @@
     public void setSeparator(String s) {
         separator = s;
     }
+
+ /**
+ * This option will suppress logging output.
+ *
+ * @param b Set to true to suppress loggint output.
+ */
+ public void setQuiet(boolean b) {
+ quiet = b;
+ }
 
     /** Do the grep */
     public void execute() {
@@ -195,8 +205,9 @@
                 if (allMatches)
                     getProject().setUser​Property(property + "_count", String.valueOf(count));
             }
- else
+ else if (!quiet) {
                 log("No match.");
+ }
         }
         catch (Exception e) {
             throw new BuildException(e.getMessage());
Messages per page: