You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/06/16 22:15:05 UTC
[2/3] git commit: [flex-falcon] [refs/heads/develop] - fix up script
fix up script
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/0445bf3a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/0445bf3a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/0445bf3a
Branch: refs/heads/develop
Commit: 0445bf3a0b27e4f02655c2292fcdf25cba849e59
Parents: 2e417ec
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 16 13:14:21 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 16 13:14:21 2014 -0700
----------------------------------------------------------------------
ApproveFalcon.xml | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0445bf3a/ApproveFalcon.xml
----------------------------------------------------------------------
diff --git a/ApproveFalcon.xml b/ApproveFalcon.xml
index 278ec35..fb23e95 100644
--- a/ApproveFalcon.xml
+++ b/ApproveFalcon.xml
@@ -135,7 +135,7 @@
<property name="package.url.path" value="https://dist.apache.org/repos/dist/dev/flex/falcon/${release.version}/rc${rc}" />
<property name="package.url.name" value="apache-flex-falconjx-${release.version}-src" />
- <condition property="zip.compressed">
+ <condition property="zip.package">
<equals arg1="zip" arg2="${package.suffix}" />
</condition>
@@ -235,12 +235,12 @@
<delete dir="${basedir}/${package.url.name}" failonerror="false" />
</target>
- <target name="untar-file" unless="zip.compressed" description="Untars zipFile">
+ <target name="untar-file" unless="zip.package" description="Untars zipFile">
<untar src="${basedir}/${package.url.name}.${package.suffix}"
dest="${basedir}" compression="gzip"/>
</target>
- <target name="unzip-file" if="zip.compressed" description="Unzips zipFile">
+ <target name="unzip-file" if="zip.package" description="Unzips zipFile">
<unzip src="${basedir}/${package.url.name}.${package.suffix}"
dest="${basedir}/${package.url.name}"/>
</target>
@@ -320,6 +320,13 @@
</not>
</condition>
</fail>
+ <fail message="NOTICE_JX not in package">
+ <condition>
+ <not>
+ <available file="${basedir}/${package.url.name}/NOTICE_JX" />
+ </not>
+ </condition>
+ </fail>
<fail message="LICENSE not in package">
<condition>
<not>
@@ -372,10 +379,10 @@
addproperty="notice.ok"/>
<antcall target="display-text" >
- <param name="file" value="${basedir}/${package.url.name}/NOTICE" />
+ <param name="file" value="${basedir}/${package.url.name}/NOTICE_JX" />
</antcall>
<input
- message="Check the NOTICE for required notices from third-parties. Is it ok?"
+ message="Check the NOTICE_JX for required notices from third-parties. Is it ok?"
validargs="y,n"
defaultvalue="y"
addproperty="noticejx.ok"/>
@@ -413,6 +420,9 @@
<equals arg1="${readme.ok}" arg2="y" />
<equals arg1="${releasenotes.ok}" arg2="y" />
<equals arg1="${notice.ok}" arg2="y" />
+ <equals arg1="${readmejx.ok}" arg2="y" />
+ <equals arg1="${releasenoteskx.ok}" arg2="y" />
+ <equals arg1="${noticejx.ok}" arg2="y" />
<equals arg1="${license.ok}" arg2="y" />
</and>
</condition>
@@ -425,8 +435,11 @@ OS: ${os.name} ${os.arch} ${os.version}
Source kit signatures match: y
Source kit builds: y
README is ok: ${readme.ok}
+README_JX is ok: ${readmejx.ok}
RELEASE_NOTES is ok: ${releasenotes.ok}
+RELEASE_NOTES_JX is ok: ${releasenotesjx.ok}
NOTICE is ok: ${notice.ok}
+NOTICE_JX is ok: ${noticejx.ok}
LICENSE is ok: ${license.ok}
No unapproved licenses or archives: ${rat.license.ok}
No unapproved binaries: ${rat.binaries.ok}