You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by xa...@apache.org on 2008/02/29 10:00:44 UTC
svn commit: r632264 - in /ant/ivy/core/trunk: build-release.xml
doc/dev/makerelease.html
Author: xavier
Date: Fri Feb 29 01:00:36 2008
New Revision: 632264
URL: http://svn.apache.org/viewvc?rev=632264&view=rev
Log:
TASK: Remove standalone jars, ivy.xml and xsd from distribution (IVY-749)
Modified:
ant/ivy/core/trunk/build-release.xml
ant/ivy/core/trunk/doc/dev/makerelease.html
Modified: ant/ivy/core/trunk/build-release.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/build-release.xml?rev=632264&r1=632263&r2=632264&view=diff
==============================================================================
--- ant/ivy/core/trunk/build-release.xml (original)
+++ ant/ivy/core/trunk/build-release.xml Fri Feb 29 01:00:36 2008
@@ -50,9 +50,9 @@
</target>
<target name="snapshot-metadata" depends="init-snapshot, resolve">
- <mkdir dir="${distrib.dir}"/>
+ <mkdir dir="${artifacts.build.dir}"/>
<ivy:deliver
- deliverpattern="${distrib.dir}/ivy.xml"
+ deliverpattern="${artifacts.build.dir}/ivy.xml"
pubrevision="${build.version}"
pubdate="${pubdate}"
status="${status}"/>
@@ -80,7 +80,7 @@
<zipfileset dir="${basedir}" includes="build.properties" fullpath="${snapshot.full.name}/build.properties"/>
<zipfileset dir="${basedir}" includes="ant.patterns" fullpath="${snapshot.full.name}/ant.patterns"/>
<zipfileset dir="${basedir}" includes="optional.patterns" fullpath="${snapshot.full.name}/optional.patterns"/>
- <zipfileset dir="${distrib.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
+ <zipfileset dir="${artifacts.build.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
<zipfileset dir="${basedir}" includes="build.xml" fullpath="${snapshot.full.name}/build.xml"/>
</zip>
@@ -100,7 +100,7 @@
<zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="${snapshot.full.name}/CHANGES.txt"/>
<zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
<zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
- <zipfileset dir="${distrib.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
+ <zipfileset dir="${artifacts.build.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
<zipfileset dir="${basedir}" includes="build-for-bin-distrib.xml" fullpath="${snapshot.full.name}/build.xml"/>
<zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
@@ -124,7 +124,7 @@
<zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="${snapshot.full.name}/CHANGES.txt"/>
<zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
<zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
- <zipfileset dir="${distrib.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
+ <zipfileset dir="${artifacts.build.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
<zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
<zipfileset dir="${artifacts.build.dir}/jars" includes="${final.core.name}" fullpath="${snapshot.full.name}/ivy-core-${build.version}.jar"/>
@@ -140,21 +140,15 @@
<target name="snapshot-bin"
depends="snapshot-bin-with-dependencies, snapshot-bin-without-dependencies" />
- <target name="snapshot-jars" depends="init-snapshot, jar">
- <mkdir dir="${distrib.dir}"/>
- <copy file="${artifacts.build.dir}/jars/${final.name}" todir="${distrib.dir}" />
- <copy file="${artifacts.build.dir}/jars/${final.core.name}" todir="${distrib.dir}" />
- </target>
-
- <target name="snapshot-xsd" depends="init-snapshot">
- <mkdir dir="${distrib.dir}"/>
- <copy file="${src.dir}/org/apache/ivy/plugins/parser/xml/ivy.xsd" todir="${distrib.dir}" />
+ <target name="release-xsd" depends="init-snapshot">
+ <!-- copies current ivy xml schema to doc source, so that it will be available from web site -->
+ <copy file="${src.dir}/org/apache/ivy/plugins/parser/xml/ivy.xsd" todir="${doc.src.dir}" />
</target>
<target name="snapshot-maven2" depends="init-snapshot, snapshot-metadata, jar, sources, javadoc">
<property name="m2.distrib.dir" value="${distrib.dir}/maven2/${build.version}" />
- <ivy:makepom ivyfile="${distrib.dir}/ivy.xml"
+ <ivy:makepom ivyfile="${artifacts.build.dir}/ivy.xml"
pomfile="${m2.distrib.dir}/ivy-${build.version}.pom"
headerfile="${basedir}/src/etc/license/license-header.xml">
<mapping conf="core" scope="compile"/>
@@ -203,7 +197,7 @@
<target name="prepare-snapshot"
depends="/localivy, clean-ivy-home, clean, clean-lib, snapshot-version, install, clean-examples, coverage-report" />
<target name="snapshot"
- depends="prepare-snapshot, snapshot-src, snapshot-bin, snapshot-jars, snapshot-xsd, snapshot-maven2, snapshot-checksums"
+ depends="prepare-snapshot, snapshot-src, snapshot-bin, snapshot-maven2, snapshot-checksums"
description="used for nightly and integration builds"/>
<target name="release" depends="release-version, snapshot" description="make a new release of Ivy"/>
Modified: ant/ivy/core/trunk/doc/dev/makerelease.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/dev/makerelease.html?rev=632264&r1=632263&r2=632264&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/dev/makerelease.html (original)
+++ ant/ivy/core/trunk/doc/dev/makerelease.html Fri Feb 29 01:00:36 2008
@@ -46,7 +46,7 @@
<code>
svn co https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.0.0-alpha1 ivy-2.0.0-beta1
</code>
-<h3>4. Double check the files which need to be updated for the release.</h3>
+<h3>4. Prepare the files which need to be updated for the release.</h3>
Check again that files have proper revision information.
It's also time to update the documentation template files which will be used for doc generation to include the version information in the page title.
For instance in
@@ -62,6 +62,12 @@
<code>
<title>${title} | Ivy 2.0.0-beta1 Documentation</title>
</code>
+
+You also need to store the current ivy xml schema in the documentation, so that it will later be accessible on public web site. To do so, run the following command in the directory in which you checked out the release branch:
+<code>
+ant -f build-release.xml release-xsd
+</code>
+
<h3>5. Add release note page in the documentation.</h3>
Open the file doc/index.html with your favorite browser, and click on the plus button in the upper right. Choose "Release Notes" as title, and "release-notes" as page id.
@@ -76,8 +82,10 @@
<h3>6. Commit your changes</h3>
<code>
+svn status
+svn add doc/ivy.xsd
svn add doc/release-notes.html
-svn ci -m "update templates and add release notes in documentation."
+svn ci -m "update templates, add release notes and ivy.xsd in documentation."
</code>
<h3>7. Check that you have no pending modifications</h3>
<code>