JSPC fixes, release work

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

build/build.xml

@@ -41,7 +41,7 @@
     <property name="target.dir" value="${basedir}/target" />
     <property name="compile.dir" value="${basedir}/target/classes" />
     <property name="jar.name" value="messengerd.jar" />
-    <property name="jar.dest.dir" value="${target.dir}/app" />
+    <property name="jar.dest.dir" value="${target.dir}/bin" />
     <property name="javadoc.src.dir" value="${src.dir}/javadoc" />
     <property name="javadoc.dest.dir" value="${basedir}/target/javadoc" />
     <property name="jspc.dest.dir" value="${target.dir}/jspc" />
@@ -190,11 +190,11 @@
 
         <!-- JSP to JAVA -->
         <jasper2
-                validateXml="false"
-                uriroot="${web.dir}"
-                outputDir="${jspc.java.dest.dir}"
-                package="org.jivesoftware.messenger.admin"
-                webXmlFragment="${jspc.dest.dir}/web.partial.xml" />
+            validateXml="false"
+            uriroot="${web.dir}"
+            outputDir="${jspc.java.dest.dir}"
+            package="org.jivesoftware.messenger.admin"
+            webXmlFragment="${jspc.dest.dir}/web.partial.xml" />
 
         <!-- Compile java source -->
         <javac
@@ -266,9 +266,49 @@
         <mkdir dir="${release.dest.dir}" />
 
         <!-- Create a new prop for the final release dir then create the dir -->
-        <property name="release.out.dir" value="${release.dest.dir}/${dist.prefix}_${version.filename}" />
+        <property name="release.out.name" value="${dist.prefix}_${version.filename}" />
+        <property name="release.out.dir" value="${release.dest.dir}/${release.out.name}" />
         <mkdir dir="${release.out.dir}" />
 
+        <!-- Copy bin dir -->
+        <copy todir="${release.out.dir}">
+            <fileset dir="${jar.dest.dir}" includes="bin/**/*.*"></fileset>
+        </copy>
+
+        <!-- Copy Javadocs -->
+        <copy todir="${release.out.dir}/docs/javadoc">
+            <fileset dir="${javadoc.dest.dir}" />
+        </copy>
+
+        <!-- Copy source -->
+        <copy todir="${release.out.dir}/src">
+            <fileset dir="${src.dir}" />
+        </copy>
+
+        <!-- Copy build -->
+        <copy todir="${release.out.dir}/build">
+            <fileset dir="${basedir}/build" />
+        </copy>
+
+        <!-- Package the release -->
+        <antcall target="release-package" />
+
+    </target>
+
+    <!-- release =============================================================================== -->
+    <target name="release-package" unless="no.package" description="Packages a release">
+
+        <!-- ZIP -->
+        <zip zipfile="${release.dest.dir}/${release.out.name}.zip"
+            basedir="${release.out.dir}/.."
+            includes="${release.out.name}/**/*.*"
+        />
+        <!-- TAR.GZ -->
+        <tar tarfile="${release.dest.dir}/${release.out.name}.tar.gz"
+            basedir="${release.out.dir}/.."
+            includes="${release.out.name}/**/*.*"
+            compression="gzip"
+        />
 
     </target>