allow a -Dnightly= flag on Approval script so it can run against nightly rcs
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/4e12e9b6 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4e12e9b6 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4e12e9b6 Branch: refs/heads/develop Commit: 4e12e9b6d5db5569dcdbd33b9ac21d7145e99d00 Parents: 57e09c3 Author: Alex Harui <aha...@apache.org> Authored: Wed Jan 21 08:28:23 2015 -0800 Committer: Erik de Bruin <e...@ixsoftware.nl> Committed: Fri Jan 23 09:20:39 2015 +0100 ---------------------------------------------------------------------- ApproveSDK.xml | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4e12e9b6/ApproveSDK.xml ---------------------------------------------------------------------- diff --git a/ApproveSDK.xml b/ApproveSDK.xml index 80906ec..1048fba 100644 --- a/ApproveSDK.xml +++ b/ApproveSDK.xml @@ -108,9 +108,11 @@ <fail message="The release version is not set. Specify -Drelease.version=<release version (e.g. 3.1, 3.2, etc)>" unless="release.version"/> - <fail message="The release candidate number is not set. Specify -Drc=<rc number (e.g. 1, 2, 3, etc)>" - unless="rc"/> - + + <condition property="package.url.path" value="http://apacheflexbuild.cloudapp.net:8080/job/flex-sdk_release-candidate/lastSuccessfulBuild/artifact/out";> + <isset property="nightly" /> + </condition> + <property name="package.url.path" value="https://dist.apache.org/repos/dist/dev/flex/sdk/${release.version}/rc${rc}"; /> <property name="package.url.name" value="apache-flex-sdk-${release.version}-src" /> @@ -159,7 +161,17 @@ classpathref="anttask.classpath"/> </target> - <target name="main" depends="install-rat,download,check-sigs,uncompress,rat-check,check-notices,build,approve" description="Perform required release approval steps"> + <target name="echo-mode" depends="echo-rc, echo-nightly" /> + <target name="echo-rc" unless="nightly"> + <fail message="The release candidate number is not set. Specify -Drc=<rc number (e.g. 1, 2, 3, etc)>" + unless="rc"/> + <echo>Testing RC${rc} of release ${release.version}</echo> + </target> + <target name="echo-nightly" if="nightly"> + <echo>Testing nightly build of release ${release.version}</echo> + </target> + + <target name="main" depends="install-rat,echo-mode,download,check-sigs,uncompress,rat-check,check-notices,build,approve" description="Perform required release approval steps"> </target> <target name="main-no-download" depends="install-rat,check-sigs,uncompress,rat-check,check-notices,build,approve" description="Perform required release approval steps"> @@ -187,6 +199,9 @@ dest="${basedir}/${package.url.name}.${package.suffix}" /> <get src="${package.url.path}/${package.url.name}.${package.suffix}.md5" dest="${basedir}/${package.url.name}.${package.suffix}.md5" /> + <antcall target="downloadasc" /> + </target> + <target name="downloadasc" if="rc" > <get src="${package.url.path}/${package.url.name}.${package.suffix}.asc" dest="${basedir}/${package.url.name}.${package.suffix}.asc" /> </target> @@ -201,6 +216,9 @@ </not> </condition> <fail message="MD5 checksum did not match" if="MD5Invalid" /> + <antcall target="checkasc" /> + </target> + <target name="checkasc" if="rc" > <exec executable="gpg" failonerror="true"> <arg value="--verify" /> <arg value="${basedir}/${package.url.name}.${package.suffix}.asc" /> @@ -256,6 +274,7 @@ <exclude name="NOTICE.base"/> <exclude name="modules/thirdparty/batik/lib/**/LICENSE*.txt"/> <exclude name="modules/thirdparty/batik/lib/**/README*.txt"/> + <exclude name="frameworks/projects/flatspark/src/flatspark/assets/fonts/**/OFL.txt"/> <!-- exclude w3c sources --> <exclude name="modules/thirdparty/batik/resources/org/apache/flex/forks/batik/dom/svg/resources/*.mod"/> <exclude name="modules/thirdparty/batik/resources/org/apache/flex/forks/batik/dom/svg/resources/*.dtd"/>
