More setup is done on an 'ant jar' now

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@121 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -149,7 +149,7 @@
     </target>
 
     <!-- jar =================================================================================== -->
-    <target name="jar" depends="compile, jspc" description="Produces a JAR of Messenger app code">
+    <target name="jar" depends="compile, jspc" description="Produces Messengers jars and sets up dependencies">
         <mkdir dir="${jar.dest.dir}" />
         <!-- Make main Messenger jar -->
         <jar jarfile="${jar.dest.dir}/${jar.name}">
@@ -176,6 +176,9 @@
         <copy todir="${jar.dest.dir}">
             <fileset dir="${lib.dist.dir}" includes="*.jar" />
         </copy>
+
+        <!-- Setup environment -->
+        <antcall target="-prepare" />
     </target>
 
     <!-- war =================================================================================== -->
@@ -303,44 +306,35 @@
         </junit>
     </target>
 
-    <!-- release =============================================================================== -->
-    <target name="release" depends="jar,javadoc" description="Creates a distribution">
-        <mkdir dir="${release.dest.dir}" />
+    <target name="-prepare">
 
-        <!-- Create a new prop for the final release dirs then create the dirs -->
-        <property name="release.out.name" value="${dist.prefix}_${version.filename}" />
-        <property name="release.src.out.name" value="${dist.prefix}_src_${version.filename}" />
-        <property name="release.out.dir" value="${release.dest.dir}/${release.out.name}" />
-        <property name="release.src.out.dir" value="${release.dest.dir}/${release.src.out.name}" />
-        <mkdir dir="${release.out.dir}" />
-        <mkdir dir="${release.src.out.dir}" />
+        <property name="prepare.out.dir" value="${target.dir}" />
 
         <!-- Copy lib dir -->
-        <copy todir="${release.out.dir}/lib">
+        <copy todir="${prepare.out.dir}/lib">
             <fileset dir="${jar.dest.dir}" includes="*.*"></fileset>
         </copy>
 
         <!-- Copy conf dir -->
-        <copy todir="${release.out.dir}">
+        <copy todir="${prepare.out.dir}">
             <fileset dir="${src.dir}" includes="conf/**/*.*"></fileset>
         </copy>
 
         <!-- Copy bin dir -->
-        <copy todir="${release.out.dir}">
+        <copy todir="${prepare.out.dir}">
             <fileset dir="${src.dir}" includes="bin/*.*" />
         </copy>
 
         <!-- Create a logs dir in the binary release -->
-        <mkdir dir="${release.out.dir}/logs" />
+        <mkdir dir="${prepare.out.dir}/logs" />
 
         <!-- Copy plugins -->
-        <copy todir="${release.out.dir}">
+        <copy todir="${prepare.out.dir}">
             <fileset dir="${src.dir}" includes="plugins/**/*.*" />
         </copy>
 
-        <!-- TODO: the following should probably take place in another target -->
         <!-- Copy admin plugin resources -->
-        <copy todir="${release.out.dir}/plugins/admin/webapp">
+        <copy todir="${prepare.out.dir}/plugins/admin/webapp">
             <!-- All web resources minus jsp's and jspf's - those are precompiled -->
             <fileset dir="${web.dir}">
                 <patternset refid="web.sources" />
@@ -349,23 +343,42 @@
             </fileset>
         </copy>
         <!-- Copy other WEB-INF stuff -->
-        <copy todir="${release.out.dir}/plugins/admin/webapp">
+        <copy todir="${prepare.out.dir}/plugins/admin/webapp">
             <fileset dir="${webapp.dest.dir}" />
         </copy>
         <!-- Copy in tag library support -->
-         <copy todir="${release.out.dir}/lib">
+         <copy todir="${prepare.out.dir}/lib">
              <fileset dir="${lib.build.dir}" includes="commons-el.jar" />
          </copy>
         <!-- Copy in pre-compiled JSP jar -->
-        <copy todir="${release.out.dir}/plugins/admin/webapp/WEB-INF/lib">
+        <copy todir="${prepare.out.dir}/plugins/admin/webapp/WEB-INF/lib">
             <fileset dir="${jspc.dest.dir}" includes="${jspc.jar.name}" />
         </copy>
         <!-- Copy in jasper runtime jar -->
-        <copy todir="${release.out.dir}/lib">
+        <copy todir="${prepare.out.dir}/lib">
             <fileset dir="${lib.build.dir}" includes="jasper-runtime.jar" />
             <fileset dir="${lib.build.dir}" includes="jasper-compiler.jar" />
         </copy>
-        
+
+    </target>
+
+    <!-- release =============================================================================== -->
+    <target name="release" depends="jar,javadoc" description="Creates a distribution">
+        <mkdir dir="${release.dest.dir}" />
+
+        <!-- Create a new prop for the final release dirs then create the dirs -->
+        <property name="release.out.name" value="${dist.prefix}_${version.filename}" />
+        <property name="release.src.out.name" value="${dist.prefix}_src_${version.filename}" />
+        <property name="release.out.dir" value="${release.dest.dir}/${release.out.name}" />
+        <property name="release.src.out.dir" value="${release.dest.dir}/${release.src.out.name}" />
+        <mkdir dir="${release.out.dir}" />
+        <mkdir dir="${release.src.out.dir}" />
+
+        <!-- Copy all prepare dirs to the binary dist -->
+        <ant antfile="${basedir}/build/build.xml" target="-prepare">
+            <property name="prepare.out.dir" value="${release.out.dir}" />
+        </ant>
+
         <!-- Copy dist docs, use filtering  -->
         <copy todir="${release.out.dir}">
             <fileset dir="${docs.dir}/dist" includes="*.*" />