Author: xavier Date: Fri Feb 29 00:15:18 2008 New Revision: 632256 URL: http://svn.apache.org/viewvc?rev=632256&view=rev Log: merge packaging fix from 2.0.0-beta2 branch (r630439)
Modified: ant/ivy/core/trunk/build-release.xml ant/ivy/core/trunk/build.xml Modified: ant/ivy/core/trunk/build-release.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/build-release.xml?rev=632256&r1=632255&r2=632256&view=diff ============================================================================== --- ant/ivy/core/trunk/build-release.xml (original) +++ ant/ivy/core/trunk/build-release.xml Fri Feb 29 00:15:18 2008 @@ -71,7 +71,7 @@ <zipfileset dir="${basedir}/test/triggers" prefix="${snapshot.full.name}/test/triggers" excludes="**/cache/**"/> <zipfileset dir="${basedir}/test/xsl" prefix="${snapshot.full.name}/test/xsl"/> <zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/> - <zipfileset dir="${basedir}" includes="MANIFEST.MF" fullpath="${snapshot.full.name}/MANIFEST.MF"/> + <zipfileset dir="${basedir}" includes="META-INF/MANIFEST.MF" fullpath="${snapshot.full.name}/META-INF/MANIFEST.MF"/> <zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/> <zipfileset dir="${basedir}" includes="README" prefix="${snapshot.full.name}"/> <zipfileset dir="${basedir}" includes="LICENSE*" prefix="${snapshot.full.name}"/> @@ -163,8 +163,7 @@ <copy file="${artifacts.build.dir}/jars/${final.name}" tofile="${m2.distrib.dir}/ivy-${build.version}.jar" /> <!-- jar javadocs --> - <jar destfile="${m2.distrib.dir}/ivy-${build.version}-javadoc.jar" - manifest="${basedir}/MANIFEST.MF"> + <jar destfile="${m2.distrib.dir}/ivy-${build.version}-javadoc.jar"> <fileset dir="${javadoc.build.dir}" /> </jar> <!-- copy sources jar --> Modified: ant/ivy/core/trunk/build.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.xml?rev=632256&r1=632255&r2=632256&view=diff ============================================================================== --- ant/ivy/core/trunk/build.xml (original) +++ ant/ivy/core/trunk/build.xml Fri Feb 29 00:15:18 2008 @@ -307,7 +307,7 @@ <!-- package the two ivy jars --> <jar destfile="${artifacts.build.dir}/jars/${final.name}" manifest="${artifacts.build.dir}/MANIFEST.MF"> - <metainf dir="${basedir}" includes="LICENSE,DISCLAIMER,NOTICE" /> + <metainf dir="${basedir}" includes="LICENSE,NOTICE" /> <manifest> <attribute name="Specification-Title" value="Apache Ivy with Ant tasks" /> <attribute name="Specification-Version" value="${build.version}" /> @@ -325,7 +325,7 @@ <fileset dir="${optional.classes.build.dir}" /> </jar> <jar destfile="${artifacts.build.dir}/jars/${final.core.name}"> - <metainf dir="${basedir}" includes="LICENSE,DISCLAIMER,NOTICE" /> + <metainf dir="${basedir}" includes="LICENSE,NOTICE" /> <manifest> <attribute name="Specification-Title" value="Apache Ivy Core (without Ant tasks)" /> <attribute name="Specification-Version" value="${build.version}" /> @@ -520,13 +520,23 @@ <target name="sources" depends="default-version" description="Create source archive files"> <mkdir dir="${artifacts.build.dir}/sources/"/> - <jar destfile="${artifacts.build.dir}/sources/${final.name}" - manifest="${basedir}/MANIFEST.MF"> + <jar destfile="${artifacts.build.dir}/sources/${final.name}"> + <metainf dir="${basedir}" includes="LICENSE,NOTICE" /> + <manifest> + <attribute name="Specification-Title" value="Apache Ivy Sources" /> + <attribute name="Specification-Version" value="${build.version}" /> + <attribute name="Specification-Vendor" value="Apache Software Foundation" /> + </manifest> <fileset dir="${src.dir}" /> </jar> <!-- TODO : we should restrict sources files to the core only --> - <jar destfile="${artifacts.build.dir}/sources/${final.core.name}" - manifest="${basedir}/MANIFEST.MF"> + <jar destfile="${artifacts.build.dir}/sources/${final.core.name}"> + <metainf dir="${basedir}" includes="LICENSE,NOTICE" /> + <manifest> + <attribute name="Specification-Title" value="Apache Ivy Sources" /> + <attribute name="Specification-Version" value="${build.version}" /> + <attribute name="Specification-Vendor" value="Apache Software Foundation" /> + </manifest> <fileset dir="${src.dir}" /> </jar> </target>