natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some packaging issues 

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.0.0-beta2@630439 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Xavier Hanin 2008-02-23 14:05:15 +00:00
parent 28db1555b3
commit 8112fdb447
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build-release.xml
View File

@ -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 -->

22
build.xml
View File

@ -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 @@ ${final.core.name} The Ivy core, eg everything but classes dependent on Ant.$
<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>