Author: rgardler
Date: Mon Sep 26 20:25:59 2011
New Revision: 1176025
URL: http://svn.apache.org/viewvc?rev=1176025&view=rev
Log:
remove widget.deploy.dir from build.properties as it was interfering with
widgets/build.xml and tidy up the widgets build a little. I've tested this and
there seems to be no side effects. However, it was put in there (by me) for a
reason in the first place so we should keep out eyes peeled on this one.
Modified:
incubator/wookie/trunk/build.properties
incubator/wookie/trunk/widgets/build.xml
Modified: incubator/wookie/trunk/build.properties
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/build.properties?rev=1176025&r1=1176024&r2=1176025&view=diff
==============================================================================
--- incubator/wookie/trunk/build.properties (original)
+++ incubator/wookie/trunk/build.properties Mon Sep 26 20:25:59 2011
@@ -71,9 +71,6 @@ wookie.parser.w3c.dir=parser
# or when "ant deploy-all" is run from any widget directory
widget.deploy.include=*/build.xml
widget.deploy.exclude=widget-template/build.xml
-# The location of the wookie deployment directory, (required: defaults to
location for
-# standalone server)
-widget.deploy.dir=build/webapp/wookie/deploy
# Feature handling properties
wookie.features.dir=features
Modified: incubator/wookie/trunk/widgets/build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/build.xml?rev=1176025&r1=1176024&r2=1176025&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/build.xml (original)
+++ incubator/wookie/trunk/widgets/build.xml Mon Sep 26 20:25:59 2011
@@ -16,10 +16,10 @@
limitations under the License.
-->
<project default="build-widget" basedir="." name="Wookie_widgets_build_file">
- <property name="wookie_root_dir" location="../"/>
+ <property name="wookie.root.dir" location="../"/>
<property file="../local.build.properties"/>
- <property file="../build.properties"/>
- <property name="project.build.dir" location="../build"/>
+ <property file="../build.properties"/>
+ <property name="project.build.dir" location="${wookie.root.dir}/build"/>
<property name="widget.deploy.dir"
location="${project.build.dir}/webapp/wookie/deploy"/>
<property name="wookie.widgets.dir" location="."/>
<property name="widget.template.dir"
value="${wookie.widgets.dir}/widget-template"/>
@@ -64,7 +64,7 @@
</target>
<target name="_init" depends="_get-widget-name, _clean">
- <delete file="${widget.build.dir}/${widget_name}" failonerror="false"/>
+ <delete file="${widget.build.dir}/${widget.shortname}.wgt"
failonerror="false"/>
<mkdir dir="${widget.build.dir}"/>
</target>
@@ -110,9 +110,9 @@
</target>
<target name="deploy-widget" depends="build-widget">
- <copy
tofile="${wookie.root.dir}/${widget.deploy.dir}/${widget.shortname}.wgt"
+ <copy tofile="${widget.deploy.dir}/${widget.shortname}.wgt"
file="${widget.build.dir}/${widget.shortname}.wgt"/>
- <echo>Deployed "${widget.shortname}" to
${wookie.root.dir}/${widget.deploy.dir}/${widget.shortname}.wgt</echo>
+ <echo>Deployed "${widget.shortname}" to
${widget.deploy.dir}/${widget.shortname}.wgt</echo>
</target>
<target name="deploy-all" description="deploy all widgets in the base
directory">
