Author: vgritsenko
Date: Thu Apr 19 19:37:18 2007
New Revision: 530615
URL: http://svn.apache.org/viewvc?view=rev&rev=530615
Log:
combine jar and war releases into single bin release.
other release packaging fixed.
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=530615&r1=530614&r2=530615
==============================================================================
--- xml/xindice/trunk/build.xml (original)
+++ xml/xindice/trunk/build.xml Thu Apr 19 19:37:18 2007
@@ -108,14 +108,14 @@
-->
<target name="compile-src" depends="init, clover.on">
<mkdir dir="${dom.build.dir}"/>
- <javac srcdir="${dom.src.dir}" destdir="${dom.build.dir}"
target="${compile.javac.target}" source="${compile.javac.source}"
+ <javac srcdir="${dom.src.dir}" destdir="${dom.build.dir}"
target="${compile.javac.target}" source="${compile.javac.source}"
debug="${compile.debug}" optimize="${compile.optimize}"
nowarn="${compile.nowarn}" deprecation="${compile.deprecation}"
verbose="${compile.verbose}">
<classpath>
<path refid="project.class.path"/>
</classpath>
</javac>
<mkdir dir="${src.build.dir}"/>
- <javac srcdir="${src.dir}" destdir="${src.build.dir}"
target="${compile.javac.target}" source="${compile.javac.source}"
+ <javac srcdir="${src.dir}" destdir="${src.build.dir}"
target="${compile.javac.target}" source="${compile.javac.source}"
debug="${compile.debug}" optimize="${compile.optimize}"
nowarn="${compile.nowarn}" deprecation="${compile.deprecation}"
verbose="${compile.verbose}">
<classpath>
<path path="${dom.build.dir}"/>
@@ -296,6 +296,7 @@
<jar jarfile="${dom.file}" basedir="${dom.build.dir}">
<manifest>
<attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Xindice-Version" value="${project.version}"/>
</manifest>
<metainf dir="." includes="LICENSE,NOTICE"/>
</jar>
@@ -313,9 +314,6 @@
<include name="${config.dir}/system.xml"/>
<include name="${config.dir}/commands.xml"/>
</webinf>
- <webinf dir="${build.dir}">
- <include name="bin/*"/>
- </webinf>
<lib refid="endorsed.jars"/>
<lib refid="core.jars"/>
<lib file="${jar.file}"/>
@@ -444,168 +442,149 @@
</target>
<!--
- - Build Jar Releases (zip, tar.gz)
+ - Build Binary Releases (zip, tar.gz)
-->
- <target name="release-jar" depends="init">
- <zip destfile="${release.dir}/xml-xindice-${project.version}-jar.zip">
+ <target name="release-bin" depends="init">
+ <mkdir dir="${release.dir}"/>
+ <zip
destfile="${release.dir}/${project.name}-${project.version}-bin.zip">
+ <zipfileset dir="."
+ prefix="${project.name}-${project.version}"
+ includes="LICENSE,README,NOTICE,legal/**,xindiced*"/>
<zipfileset dir="."
- prefix="xindice-${project.version}"
- includes="LICENSE,README,NOTICE,legal"/>
- <zipfileset dir="${build.dir}"
- prefix="xindice-${project.version}"
-
includes="xindice-${project.version}.jar,xindice-dom-${project.version}.jar"/>
+ prefix="${project.name}-${project.version}"
+
includes="${project.filename}-${project.version}.jar,${project.filename}-dom-${project.version}.jar"/>
+ <zipfileset dir="."
+ prefix="${project.name}-${project.version}"
+
includes="${project.filename}-${project.version}.xml,${project.filename}-${project.version}.war"/>
<zipfileset dir="${build.dir}/bin"
- prefix="xindice-${project.version}/${bin.dir}"/>
- <zipfileset dir="${jar.dir}"
- prefix="xindice-${project.version}/lib"/>
+
prefix="${project.name}-${project.version}/${bin.dir}"/>
<zipfileset dir="${config.dir}"
- prefix="xindice-${project.version}/config"
+
prefix="${project.name}-${project.version}/${config.dir}"
excludes="web.xml,xindice.xml,vm.cfg"/>
+ <zipfileset dir="${jar.dir}"
+
prefix="${project.name}-${project.version}/${jar.dir}"/>
+ <zipfileset dir="${tools.dir}"
+
prefix="${project.name}-${project.version}/${tools.dir}"
+ includes="jetty/**"/>
<zipfileset dir="${build.dir}/site"
- prefix="xindice-${project.version}/docs"
+ prefix="${project.name}-${project.version}/docs"
excludes="api/index.html"/>
<zipfileset dir="${api.dir}"
- prefix="xindice-${project.version}/docs/api"/>
+ prefix="${project.name}-${project.version}/docs/api"/>
</zip>
- <tar destfile="${build.dir}/xml-xindice-${project.version}-jar.tar">
+ <tar
destfile="${build.dir}/${project.name}-${project.version}-bin.tar">
<tarfileset dir="."
- prefix="xindice-${project.version}"
+ prefix="${project.name}-${project.version}"
preserveLeadingSlashes="true"
- includes="LICENSE,README,NOTICE,legal"/>
- <tarfileset dir="${build.dir}"
- prefix="xindice-${project.version}"
+ includes="LICENSE,README,NOTICE,legal/**"/>
+ <tarfileset dir="."
+ mode="755"
+ prefix="${project.name}-${project.version}"
preserveLeadingSlashes="true"
-
includes="xindice-${project.version}.jar,xindice-dom-${project.version}.jar"/>
+ includes="xindiced*"/>
+ <tarfileset dir="."
+ prefix="${project.name}-${project.version}"
+ preserveLeadingSlashes="true"
+
includes="${project.filename}-${project.version}.jar,${project.filename}-dom-${project.version}.jar"/>
+ <tarfileset dir="."
+ prefix="${project.name}-${project.version}"
+ preserveLeadingSlashes="true"
+
includes="${project.filename}-${project.version}.xml,${project.filename}-${project.version}.war"/>
<tarfileset dir="${build.dir}/bin"
mode="755"
- prefix="xindice-${project.version}/${bin.dir}"
+ prefix="${project.name}-${project.version}/${bin.dir}"
preserveLeadingSlashes="true"/>
<tarfileset dir="${config.dir}"
- prefix="xindice-${project.version}/${config.dir}"
+
prefix="${project.name}-${project.version}/${config.dir}"
preserveLeadingSlashes="true"
excludes="web.xml,xindice.xml,vm.cfg"/>
<tarfileset dir="${jar.dir}"
- prefix="xindice-${project.version}/lib"
+ prefix="${project.name}-${project.version}/${jar.dir}"
preserveLeadingSlashes="true"/>
- <tarfileset dir="${build.dir}/site"
- prefix="xindice-${project.version}/docs"
- preserveLeadingSlashes="true"
- excludes="api/index.html"/>
- <tarfileset dir="${api.dir}"
- prefix="xindice-${project.version}/docs/api"
- preserveLeadingSlashes="true"/>
- </tar>
-
- <gzip src="${build.dir}/xml-xindice-${project.version}-jar.tar"
-
zipfile="${release.dir}/xml-xindice-${project.version}-jar.tar.gz"/>
- </target>
-
- <!--
- - Build War Releases (zip, tar.gz)
- -->
- <target name="release-war" depends="init">
- <zip destfile="${release.dir}/xml-xindice-${project.version}-war.zip">
- <zipfileset dir="."
- prefix="xindice-${project.version}"
- includes="LICENSE,README,NOTICE,legal"/>
- <zipfileset dir="${build.dir}"
- prefix="xindice-${project.version}"
-
includes="xindice-${project.version}.xml,xindice-${project.version}.war"/>
- <zipfileset dir="${build.dir}/site"
- prefix="xindice-${project.version}/docs"
- excludes="api/index.html"/>
- <zipfileset dir="${api.dir}"
- prefix="xindice-${project.version}/docs/api"/>
- </zip>
-
- <tar destfile="${build.dir}/xml-xindice-${project.version}-war.tar">
- <tarfileset dir="."
- prefix="xindice-${project.version}"
- preserveLeadingSlashes="true"
- includes="LICENSE,README,NOTICE,legal"/>
- <tarfileset dir="${build.dir}"
- prefix="xindice-${project.version}"
+ <tarfileset dir="${tools.dir}"
+
prefix="${project.name}-${project.version}/${tools.dir}"
preserveLeadingSlashes="true"
-
includes="xindice-${project.version}.xml,xindice-${project.version}.war"/>
+ includes="jetty/**"/>
<tarfileset dir="${build.dir}/site"
- prefix="xindice-${project.version}/docs"
+ prefix="${project.name}-${project.version}/docs"
preserveLeadingSlashes="true"
excludes="api/index.html"/>
<tarfileset dir="${api.dir}"
- prefix="xindice-${project.version}/docs/api"
+ prefix="${project.name}-${project.version}/docs/api"
preserveLeadingSlashes="true"/>
</tar>
- <gzip src="${build.dir}/xml-xindice-${project.version}-war.tar"
-
zipfile="${release.dir}/xml-xindice-${project.version}-war.tar.gz"/>
+ <gzip src="${build.dir}/${project.name}-${project.version}-bin.tar"
+
zipfile="${release.dir}/${project.name}-${project.version}-bin.tar.gz"/>
</target>
<!--
- - Build Src Releases (zip, tar.gz)
+ - Build Source Releases (zip, tar.gz)
-->
<target name="release-src" depends="init">
- <zip destfile="${release.dir}/xml-xindice-${project.version}-src.zip">
+ <mkdir dir="${release.dir}"/>
+ <zip
destfile="${release.dir}/${project.name}-${project.version}-src.zip">
<zipfileset dir="."
- prefix="xindice-${project.version}"
-
includes="LICENSE,README,NOTICE,legal,KEYS,build.*,forrest.*,status.xml,xindice.*"/>
+ prefix="${project.name}-${project.version}"
+
includes="LICENSE,README,NOTICE,legal/**,KEYS,build.*,forrest.*,status.xml,xindiced*"/>
<zipfileset dir="${bin.dir}"
- prefix="xindice-${project.version}/${bin.dir}"/>
+
prefix="${project.name}-${project.version}/${bin.dir}"/>
<zipfileset dir="${jar.dir}"
- prefix="xindice-${project.version}/${jar.dir}"/>
+
prefix="${project.name}-${project.version}/${jar.dir}"/>
<zipfileset dir="${tools.dir}"
- prefix="xindice-${project.version}/${tools.dir}"/>
+
prefix="${project.name}-${project.version}/${tools.dir}"/>
<zipfileset dir="${config.dir}"
- prefix="xindice-${project.version}/config"/>
+ prefix="${project.name}-${project.version}/config"/>
<zipfileset dir="${root.dir}/examples"
-
prefix="xindice-${project.version}/${root.dir}/examples"/>
+
prefix="${project.name}-${project.version}/${root.dir}/examples"/>
<zipfileset dir="${root.dir}/src"
- prefix="xindice-${project.version}/${root.dir}/src"/>
+
prefix="${project.name}-${project.version}/${root.dir}/src"/>
<zipfileset dir="${root.dir}/tests"
- prefix="xindice-${project.version}/${root.dir}/tests"/>
+
prefix="${project.name}-${project.version}/${root.dir}/tests"/>
<zipfileset dir="${documentation.dir}"
-
prefix="xindice-${project.version}/${documentation.dir}"/>
+
prefix="${project.name}-${project.version}/${documentation.dir}"/>
</zip>
- <tar destfile="${build.dir}/xml-xindice-${project.version}-src.tar">
+ <tar
destfile="${build.dir}/${project.name}-${project.version}-src.tar">
<tarfileset dir="."
- prefix="xindice-${project.version}"
+ prefix="${project.name}-${project.version}"
preserveLeadingSlashes="true"
-
includes="LICENSE,README,NOTICE,legal,KEYS,build.*,forrest.*,status.xml,xindice.*"/>
+
includes="LICENSE,README,NOTICE,legal/**,KEYS,build.*,forrest.*,status.xml,xindiced*"/>
<tarfileset dir="${bin.dir}"
mode="755"
- prefix="xindice-${project.version}/${bin.dir}"
+ prefix="${project.name}-${project.version}/${bin.dir}"
preserveLeadingSlashes="true"/>
<tarfileset dir="${jar.dir}"
- prefix="xindice-${project.version}/${jar.dir}"
+ prefix="${project.name}-${project.version}/${jar.dir}"
preserveLeadingSlashes="true"/>
<tarfileset dir="${tools.dir}"
- prefix="xindice-${project.version}/${tools.dir}"
+
prefix="${project.name}-${project.version}/${tools.dir}"
preserveLeadingSlashes="true"/>
<tarfileset dir="${config.dir}"
- prefix="xindice-${project.version}/${config.dir}"
+
prefix="${project.name}-${project.version}/${config.dir}"
preserveLeadingSlashes="true"/>
<tarfileset dir="${root.dir}/examples"
-
prefix="xindice-${project.version}/${root.dir}/examples"
+
prefix="${project.name}-${project.version}/${root.dir}/examples"
preserveLeadingSlashes="true"/>
<tarfileset dir="${root.dir}/src"
- prefix="xindice-${project.version}/${root.dir}/src"
+
prefix="${project.name}-${project.version}/${root.dir}/src"
preserveLeadingSlashes="true"/>
<tarfileset dir="${root.dir}/tests"
- prefix="xindice-${project.version}/${root.dir}/tests"
+
prefix="${project.name}-${project.version}/${root.dir}/tests"
preserveLeadingSlashes="true"/>
<tarfileset dir="${documentation.dir}"
-
prefix="xindice-${project.version}/${documentation.dir}"
+
prefix="${project.name}-${project.version}/${documentation.dir}"
preserveLeadingSlashes="true"/>
</tar>
- <gzip src="${build.dir}/xml-xindice-${project.version}-src.tar"
-
zipfile="${release.dir}/xml-xindice-${project.version}-src.tar.gz"/>
+ <gzip src="${build.dir}/${project.name}-${project.version}-src.tar"
+
zipfile="${release.dir}/${project.name}-${project.version}-src.tar.gz"/>
</target>
- <target name="release" depends="build, javadoc, site, release-jar,
release-war, release-src"/>
+ <target name="release" depends="build, javadoc, site, release-bin,
release-src"/>
<!--
- PMD is a tool that checks for various code mistakes, like unused
