Don't forget to document this Sent from my mobile device (so please excuse typos)
On 20 May 2011, at 08:45, [email protected] wrote: > Author: scottbw > Date: Fri May 20 07:45:28 2011 > New Revision: 1125265 > > URL: http://svn.apache.org/viewvc?rev=1125265&view=rev > Log: > Updated build scripts so that sets of widgets (extras, scratchpad) can be > deployed as part of a build using build properties, in exactly the same > manner as features > > Modified: > incubator/wookie/trunk/build.properties > incubator/wookie/trunk/build.xml > incubator/wookie/trunk/scratchpad/widgets/build.xml > > Modified: incubator/wookie/trunk/build.properties > URL: > http://svn.apache.org/viewvc/incubator/wookie/trunk/build.properties?rev=1125265&r1=1125264&r2=1125265&view=diff > ============================================================================== > --- incubator/wookie/trunk/build.properties (original) > +++ incubator/wookie/trunk/build.properties Fri May 20 07:45:28 2011 > @@ -13,6 +13,11 @@ include.extra.features > # Uncomment to include Scratchpad features > #include.scratchpad.features > > +# Uncomment to include Extra widgets > +include.extra.widgets > +# Uncomment to include Scratchpad widgets > +#include.scratchpad.widgets > + > # The location of your servlets webapp directory, (required: defaults to > location for > # standalone server) > servletEngine.webapp.dir=build/webapp > > Modified: incubator/wookie/trunk/build.xml > URL: > http://svn.apache.org/viewvc/incubator/wookie/trunk/build.xml?rev=1125265&r1=1125264&r2=1125265&view=diff > ============================================================================== > --- incubator/wookie/trunk/build.xml (original) > +++ incubator/wookie/trunk/build.xml Fri May 20 07:45:28 2011 > @@ -59,14 +59,29 @@ > <antcall target="post-deploy-webapp-features-scratchpad"/> > <!-- deploy widgets --> > <delete dir="${widget.build.dir}"/> > + <antcall target="post-deploy-webapp-widgets-extra"/> > + <antcall target="post-deploy-webapp-widgets-scratchpad"/> > + </target> > + > + <target name="post-deploy-webapp-widgets-extra" if="include.extra.widgets"> > <subant antfile="build.xml" target="deploy-widget" inheritall="true"> > - <property name="deployToDev" value="true"/> > - <fileset dir="${wookie.widgets.dir}"> > - <include name="${widget.deploy.include}"/> > - <exclude name="${widget.deploy.exclude}"/> > - </fileset> > - </subant> > + <property name="deployToDev" value="true"/> > + <fileset dir="${wookie.widgets.dir}"> > + <include name="${widget.deploy.include}"/> > + <exclude name="${widget.deploy.exclude}"/> > + </fileset> > + </subant> > </target> > + > + <target name="post-deploy-webapp-widgets-scratchpad" > if="include.scratchpad.widgets"> > + <subant antfile="build.xml" target="deploy-widget" inheritall="true"> > + <property name="deployToDev" value="true"/> > + <fileset dir="${user.dir}/scratchpad/widgets"> > + <include name="${widget.deploy.include}"/> > + <exclude name="${widget.deploy.exclude}"/> > + </fileset> > + </subant> > + </target> > > <target name="post-deploy-webapp-features-extra" > if="include.extra.features"> > <echo>deploying extra features</echo> > > Modified: incubator/wookie/trunk/scratchpad/widgets/build.xml > URL: > http://svn.apache.org/viewvc/incubator/wookie/trunk/scratchpad/widgets/build.xml?rev=1125265&r1=1125264&r2=1125265&view=diff > ============================================================================== > --- incubator/wookie/trunk/scratchpad/widgets/build.xml (original) > +++ incubator/wookie/trunk/scratchpad/widgets/build.xml Fri May 20 07:45:28 > 2011 > @@ -18,8 +18,14 @@ > <project default="build-widget" basedir="." > name="Wookie_scratchpad_widgets_build_file"> > <property name="wookie.root.dir" location="../.."/> > <property name="project.build.dir" location="${wookie.root.dir}/build"/> > - <property name="wookie.widgets.dir" location="."/> > <property name="widget.template.dir" > value="${wookie.root.dir}/widgets/widget-template"/> > > <import file="${wookie.root.dir}/widgets/build.xml"/> > + > + <target name="build-widget" depends="_init"> > + <zip destfile="${widget.build.dir}/${widget.shortname}.wgt" > + > basedir="${wookie.root.dir}/scratchpad/widgets/${widget.shortname}" > + /> > + <echo>Widget package created at > ${widget.build.dir}/${widget.shortname}.wgt</echo> > + </target> > </project> > \ No newline at end of file > >
