> -----Original Message----- > From: Gav... [mailto:ga...@16degrees.com.au] > Sent: Sunday, 6 June 2010 8:17 AM > To: dev@forrest.apache.org > Subject: RE: svn commit: r951719 - /forrest/trunk/plugins/build.xml > > > > > -----Original Message----- > > From: Tim Williams [mailto:william...@gmail.com] > > Sent: Sunday, 6 June 2010 7:05 AM > > To: Forrest Developers List > > Subject: Re: svn commit: r951719 - /forrest/trunk/plugins/build.xml > > > > On Sat, Jun 5, 2010 at 9:56 AM, <cross...@apache.org> wrote: > > > Author: crossley > > > Date: Sat Jun 5 13:56:23 2010 > > > New Revision: 951719 > > > > > > URL: http://svn.apache.org/viewvc?rev=951719&view=rev > > > Log: > > > Better detection of "java_exists". > > > Issue: FOR-1137 > > > > > > Modified: > > > forrest/trunk/plugins/build.xml > > > > > > Modified: forrest/trunk/plugins/build.xml > > > URL: > > > http://svn.apache.org/viewvc/forrest/trunk/plugins/build.xml?rev=951719 > > &r1=951718&r2=951719&view=diff > > > > > > ======================================================================= > > ======= > > > --- forrest/trunk/plugins/build.xml (original) > > > +++ forrest/trunk/plugins/build.xml Sat Jun 5 13:56:23 2010 > > > @@ -87,7 +87,8 @@ > > > <fileset dir="${plugin.lib.dir}" includes="*.jar"/> > > > <fileset dir="${plugin.lib.dir}" includes="*.zip"/> > > > </path> > > > - <available file="${plugin.java.dir}" property="java_exists" > > type="dir"/> > > > + <fileset dir="${plugin.java.dir}" id="java_present" > > includes="**/*.java"/> > > > + <pathconvert property="java_exists" refid="java_present" > > setonempty="false"/> > > > </target> > > > <target name="echo-init" depends="init-build-compiler" > > unless="no.echo.init"> > > > <buildnumber file="${build.dir}/build.number"/> > > > > I'm pretty sure this is causing our ails at the moment. I don't have > > time to figure out what it's all about and update it properly, should > > we revert for now? > > From what I can tell it should be something like: > > <fileset dir="${plugin.java.dir}" id="java_present"> > <include name ="**/*.java"/> > </fileset> > > (the includes= seems to include a dir rather than a set of files) > > I'll test it shortly.
I was wrong there, either should be acceptable and makes no difference to the output. > > Gav... > > > > > > > > --tim >
