Changeset 400

Timestamp:

02/28/10 20:10:04 (5 months ago)

Author:

jboudart

Message:

Fix #103 : distribution archive should contain a root directory named easyant-VVV
Should fix #104: Zip Archive Corrupt? (some files were added many times in the full distribution)

Files:

• trunk/module.ant (modified) (3 diffs)

trunk/module.ant

@@ -145 +145 @@
         </macrodef>
 
+        <target name="clean-distribution" phase="distribution" description="clean distribution dir">
+                <delete dir="${target.distribution}"/>
+        </target> 
+
 
         <!-- Create a zip for distribution -->
         <target name="package-distribution" phase="distribution" depends="prepare-distribution" description="package a distribution">
+                <property name="root.dir" value="${ivy.module}-${ivy.revision}"/>
                 <mkdir dir="${target.distribution}" />
                 <echo message="Packaging standard distribution." />
-                <bundle destfile="${target.distribution}/${ivy.module}">
-                        <zipfileset refid="easyant-files.fileset" />
-                        <zipfileset refid="easyant-jars.fileset" prefix="lib"/>
-                        <zipfileset refid="easyant-deps.fileset" prefix="lib"/>
+                <bundle destfile="${target.distribution}/${ivy.module}-${version}">
+                        <zipfileset refid="easyant-files.fileset" prefix="${root.dir}"/>
+                        <zipfileset refid="easyant-jars.fileset" prefix="${root.dir}/lib"/>
+                        <zipfileset refid="easyant-deps.fileset" prefix="${root.dir}/lib"/>
                         <!-- ship the documentation -->
-                        <zipfileset dir="${target.documentation.dir}" prefix="doc"/>
+                        <zipfileset dir="${target.documentation.dir}" prefix="${root.dir}/doc"/>
                         <!-- be sure that scripts are executable -->
-                        <zipfileset dir="${basedir}" filemode="744" includes="bin/**" />
+                        <zipfileset dir="${basedir}" filemode="744" includes="bin/**" prefix="${root.dir}"/>
                 </bundle>
 
@@ -163 +168 @@
 
         <target name="package-documentation" phase="distribution" description="package the documentation">
+                <property name="root.dir" value="${ivy.module}-${ivy.revision}-docs"/>
                 <mkdir dir="${target.distribution}" />
                 <echo message="Packaging documentation distribution." />
-                <bundle destfile="${target.distribution}/${ivy.module}-docs">
-                        <fileset dir="${target.documentation.dir}" />
+                <bundle destfile="${target.distribution}/${ivy.module}-${version}-docs">
+                        <zipfileset dir="${target.documentation.dir}" prefix="${root.dir}"/>
                 </bundle>
         </target>
@@ -172 +178 @@
         <!-- Create a zip for full distribution  -->
         <target name="package-full-distribution" phase="distribution" depends="prepare-distribution" description="package a distribution (including includes sources)">
+                <property name="root.dir" value="${ivy.module}-${ivy.revision}-full"/>
                 <mkdir dir="${target.distribution}" />
                 <echo message="Packaging full distribution." />
-                <bundle destfile="${target.distribution}/${ivy.module}-full">
-                        <zipfileset refid="easyant-files.fileset" />
-                        <zipfileset refid="easyant-jars.fileset" prefix="lib"/>
-                        <zipfileset refid="easyant-deps.fileset" prefix="lib"/>
+                <bundle destfile="${target.distribution}/${ivy.module}-${version}-full">
+                        <zipfileset refid="easyant-files.fileset" prefix="${root.dir}" />
+                        <zipfileset refid="easyant-jars.fileset" prefix="${root.dir}/lib"/>
+                        <zipfileset refid="easyant-deps.fileset" prefix="${root.dir}/lib"/>
                         <!-- easyant sources -->
-                        <zipfileset dir="${basedir}" includes="src/**,module.ant, module.ivy,repository/**"/>
+                        <zipfileset dir="${basedir}" includes="src/**,module.ant, module.ivy,repository/extra-modules/**" prefix="${root.dir}"/>
                         <!-- be sure that scripts are executable -->
-                        <zipfileset dir="${basedir}" filemode="744" includes="bin/**" />
+                        <zipfileset dir="${basedir}" filemode="744" includes="bin/**" prefix="${root.dir}"/>
                 </bundle>
         </target>
+
 </project>