-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Applied. Thanks, Sanka Kev Jackson wrote: > Hi, > > Here's a mildly cleaner build.xml for BSF. We are looking at > including arbitrary conditions on all tasks based on the fact that > to clean up this build file further I'd like to be able to do: > > <echo message="bar" if="${foo}"/> > > And at the moment ant doesn't support this. > > Anyway, here's the patch. > > Kev > > ---------------------------------------------------------------------- > > > Index: . > =================================================================== > --- . (revision 438751) +++ . (working copy) @@ -62,11 +62,9 @@ > <!-- > =================================================================== > --> <patternset id="java.source.files"> <!-- Optionally includes > engines based on dependencies being present --> - <!-- FIXME: > Exclude the first three, temporarily --> > > <include name="**/bsf/*.java" /> <include name="**/util/**/*.java" > /> - <include name="**/jacl/**" if="jacl.present" /> <include > name="**/javascript/**" if="rhino.present" /> <include > name="**/jython/**" if="jython.present" /> @@ -179,7 +177,6 @@ > <antcall target="checkJython" /> <antcall target="checkNetRexx" /> > <antcall target="checkRhino" /> - <!--<echo message="Warning: > Rhino dependencies were not resolved." unless="rhino.present"/>--> > <antcall target="checkXalan" /> <antcall target="checkJUnit" /> > </target> @@ -184,11 +181,6 @@ <antcall target="checkJUnit" /> > </target> > > - - - - - <!-- > =================================================================== > --> <!-- Compiles the source directory > --> <!-- > =================================================================== > --> @@ -196,9 +188,11 @@ <mkdir dir="${build.dest}"/> <javac > srcdir="${src.dir}" destdir="${build.dest}" > debug="${project.debug}" deprecation="${project.deprecation}"> > <classpath> - <fileset dir="lib"><include > name="*.jar"/></fileset> + <fileset dir="lib"> + <include > name="*.jar"/> + </fileset> </classpath> - <patternset > refid="java.source.files"></patternset> + <patternset > refid="java.source.files"/> </javac> </target> > > @@ -252,11 +246,9 @@ <classpath refid="anakia.classpath" /> > </taskdef> > > - <anakia basedir="${site.src}" destdir="${site.dest}/" > extension=".html" style="./site.vsl" > projectFile="${site.projectFile}" excludes="**/stylesheets/** > faq.xml" includes="**/*.xml" lastModifiedCheck="true" > templatePath="${templ.path}" > velocityPropertiesFile="${velocity.props}"> - </anakia> + <anakia > basedir="${site.src}" destdir="${site.dest}/" extension=".html" > style="./site.vsl" projectFile="${site.projectFile}" > excludes="**/stylesheets/** faq.xml" includes="**/*.xml" > lastModifiedCheck="true" templatePath="${templ.path}" > velocityPropertiesFile="${velocity.props}"/> > > - <anakia basedir="${site.src}" destdir="${site.dest}/" > extension=".html" style="./faq.vsl" > projectFile="${site.projectFile}" includes="faq.xml" > lastModifiedCheck="true" templatePath="${templ.path}" > velocityPropertiesFile="${velocity.props}"> - </anakia> + <anakia > basedir="${site.src}" destdir="${site.dest}/" extension=".html" > style="./faq.vsl" projectFile="${site.projectFile}" > includes="faq.xml" lastModifiedCheck="true" > templatePath="${templ.path}" > velocityPropertiesFile="${velocity.props}"/> > > <copy todir="${site.dest}/images" filtering="no"> <fileset > dir="${site.src}/images"> > > > ---------------------------------------------------------------------- > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] For > additional commands, e-mail: [EMAIL PROTECTED] - -- Sanka Samaranayake WSO2 Inc. T:+94-77-3506382 F:+94-11-2424304 http://sankas.blogspot.com/ http://www.wso2.net/ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) iD8DBQFE+dQy/Hd0ETKdgNIRApeuAJ41WcC9/WbNpQgz1Wnc6gAFeirYTACfVkvv fCqnqSGi93tuPw8P9/+iEkg= =PX9P -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]