svn commit: r532738 - /xml/xindice/trunk/build.xml

Author: vgritsenko
Date: Thu Apr 26 06:30:38 2007
New Revision: 532738

URL: http://svn.apache.org/viewvc?view=rev&rev=532738
Log:
more fixed: use 'filemode' on zip file sets
combine some entries

Modified:
    xml/xindice/trunk/build.xml

Modified: xml/xindice/trunk/build.xml
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/build.xml?view=diff&rev=532738&r1=532737&r2=532738
==============================================================================
--- xml/xindice/trunk/build.xml (original)
+++ xml/xindice/trunk/build.xml Thu Apr 26 06:30:38 2007
@@ -449,7 +449,11 @@
         <zip destfile="${release.dir}/${project.name}-${project.version}-bin.zip">
             <zipfileset dir="."
                         prefix="${project.name}-${project.version}"
-                        includes="LICENSE,README,NOTICE,legal/**,xindiced*"/>
+                        includes="LICENSE,README,NOTICE,legal/**,xindiced.bat"/>
+            <zipfileset dir="."
+                        filemode="755"
+                        prefix="${project.name}-${project.version}"
+                        includes="xindiced"/>
             <zipfileset dir="."
                         prefix="${project.name}-${project.version}"
                         includes="${project.filename}-${project.version}.jar,${project.filename}-dom-${project.version}.jar"/>
@@ -457,6 +461,7 @@
                         prefix="${project.name}-${project.version}"
                         includes="${project.filename}-${project.version}.xml,${project.filename}-${project.version}.war"/>
             <zipfileset dir="${build.dir}/bin"
+                        filemode="755"
                         prefix="${project.name}-${project.version}/${bin.dir}"/>
             <zipfileset dir="${config.dir}"
                         prefix="${project.name}-${project.version}/${config.dir}"
@@ -527,55 +532,34 @@
         <zip destfile="${release.dir}/${project.name}-${project.version}-src.zip">
             <zipfileset dir="."
                         prefix="${project.name}-${project.version}"
-                        includes="LICENSE,README,NOTICE,legal/**,KEYS,build.*,forrest.*,status.xml,xindiced*"/>
-            <zipfileset dir="${bin.dir}"
-                        prefix="${project.name}-${project.version}/${bin.dir}"/>
-            <zipfileset dir="${jar.dir}"
-                        prefix="${project.name}-${project.version}/${jar.dir}"/>
-            <zipfileset dir="${tools.dir}"
-                        prefix="${project.name}-${project.version}/${tools.dir}"/>
-            <zipfileset dir="${config.dir}"
-                        prefix="${project.name}-${project.version}/config"/>
-
-            <zipfileset dir="${root.dir}"
-                        prefix="${project.name}-${project.version}/${root.dir}"
-                        excludes="scratchpad/**"/>
-            <zipfileset dir="${documentation.dir}"
-                        prefix="${project.name}-${project.version}/${documentation.dir}"/>
+                        includes="LICENSE,README,NOTICE,legal/**,KEYS,build.*,forrest.*,status.xml,xindiced*"
+                        excludes="build.sh,xindiced"/>
+            <zipfileset dir="."
+                        filemode="755"
+                        prefix="${project.name}-${project.version}"
+                        includes="build.sh,xindiced,${bin.dir}/**"/>
+            <zipfileset dir="."
+                        prefix="${project.name}-${project.version}/${jar.dir}"
+                        includes="${jar.dir}/**,${tools.dir}/**,${config.dir}/**,${root.dir}/**,${documentation.dir}/**"
+                        excludes="${root.dir}/scratchpad/**"/>
         </zip>
 
         <tar destfile="${build.dir}/${project.name}-${project.version}-src.tar">
             <tarfileset dir="."
                         prefix="${project.name}-${project.version}"
                         preserveLeadingSlashes="true"
-                        includes="LICENSE,README,NOTICE,legal/**,KEYS,forrest.*,status.xml,build.*,xindiced.bat"
+                        includes="LICENSE,README,NOTICE,legal/**,KEYS,build.*,forrest.*,status.xml,xindiced*"
                         excludes="build.sh,xindiced"/>
             <tarfileset dir="."
                         mode="755"
                         prefix="${project.name}-${project.version}"
                         preserveLeadingSlashes="true"
-                        includes="build.sh,xindiced"/>
-            <tarfileset dir="${bin.dir}"
-                        mode="755"
-                        prefix="${project.name}-${project.version}/${bin.dir}"
-                        preserveLeadingSlashes="true"/>
-            <tarfileset dir="${jar.dir}"
-                        prefix="${project.name}-${project.version}/${jar.dir}"
-                        preserveLeadingSlashes="true"/>
-            <tarfileset dir="${tools.dir}"
-                        prefix="${project.name}-${project.version}/${tools.dir}"
-                        preserveLeadingSlashes="true"/>
-            <tarfileset dir="${config.dir}"
-                        prefix="${project.name}-${project.version}/${config.dir}"
-                        preserveLeadingSlashes="true"/>
-
-            <tarfileset dir="${root.dir}"
-                        prefix="${project.name}-${project.version}/${root.dir}"
+                        includes="build.sh,xindiced,${bin.dir}/**"/>
+            <tarfileset dir="."
+                        prefix="${project.name}-${project.version}"
                         preserveLeadingSlashes="true"
-                        excludes="scratchpad/**"/>
-            <tarfileset dir="${documentation.dir}"
-                        prefix="${project.name}-${project.version}/${documentation.dir}"
-                        preserveLeadingSlashes="true"/>
+                        includes="${jar.dir}/**,${tools.dir}/**,${config.dir}/**,${root.dir}/**,${documentation.dir}/**"
+                        excludes="${root.dir}/scratchpad/**"/>
         </tar>
 
         <gzip src="${build.dir}/${project.name}-${project.version}-src.tar"