Commit ce4f17fa authored by Marilyn Daum's avatar Marilyn Daum Committed by marilyn

Move liveassistant plugin out of the src dir while building wildfire.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3354 b35dd754-fafc-0310-a699-88a17e54d16e
parent acfce3d1
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
<property name="plugin.dev.dir" value=""/> <!-- Set by a developer as alt plugin location --> <property name="plugin.dev.dir" value=""/> <!-- Set by a developer as alt plugin location -->
<property name="plugin.dev.dest.dir" value="${target.dir}/plugins-dev"/> <property name="plugin.dev.dest.dir" value="${target.dir}/plugins-dev"/>
<property name="plugin.dest.dir" value="${target.dir}/plugins"/> <property name="plugin.dest.dir" value="${target.dir}/plugins"/>
<property name="nonrelease.plugin.dir" value="${basedir}/plugins-tmp"/>
<property name="webapp.dest.dir" value="${target.dir}/webapp"/> <property name="webapp.dest.dir" value="${target.dir}/webapp"/>
<property name="war.name" value="wildfire.war"/> <property name="war.name" value="wildfire.war"/>
<property name="war.dest.dir" value="${target.dir}/war"/> <property name="war.dest.dir" value="${target.dir}/war"/>
...@@ -647,6 +648,11 @@ ...@@ -647,6 +648,11 @@
<target name="release" depends="clean,jar,javadoc" description="Creates a distribution"> <target name="release" depends="clean,jar,javadoc" description="Creates a distribution">
<mkdir dir="${release.dest.dir}"/> <mkdir dir="${release.dest.dir}"/>
<!-- Move non-checked-in plugins out of the way -->
<mkdir dir="${nonrelease.plugin.dir}"/>
<available file="${plugin.src.dir}/liveassistant" property="non-release-plugins" value="true"/>
<antcall target="mv-plugins-out" />
<!-- Create a new prop for the final release dirs then create the dirs --> <!-- Create a new prop for the final release dirs then create the dirs -->
<!-- ie: wildfire --> <!-- ie: wildfire -->
...@@ -770,6 +776,24 @@ ...@@ -770,6 +776,24 @@
<!-- Package the release --> <!-- Package the release -->
<antcall target="release-package"/> <antcall target="release-package"/>
<!-- Move non-checked-in plugins back -->
<antcall target="mv-plugins-back" />
<delete dir="${nonrelease.plugin.dir}"/>
</target>
<!-- mv-plugins-out ========================================================================== -->
<target name="mv-plugins-out" if="non-release-plugins">
<move todir="${nonrelease.plugin.dir}/liveassistant">
<fileset dir="${plugin.src.dir}/liveassistant"/>
</move>
</target>
<!-- mv-plugins-back ========================================================================== -->
<target name="mv-plugins-back" if="non-release-plugins">
<move todir="${plugin.src.dir}/liveassistant">
<fileset dir="${nonrelease.plugin.dir}/liveassistant"/>
</move>
</target> </target>
<!-- quickrelease ========================================================================== --> <!-- quickrelease ========================================================================== -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment