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 2017/11/04 06:42:32 UTC
git commit: [flex-utilities] [refs/heads/develop] - handle nightly
Repository: flex-utilities
Updated Branches:
refs/heads/develop 913dc7f44 -> af24d862b
handle nightly
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/af24d862
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/af24d862
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/af24d862
Branch: refs/heads/develop
Commit: af24d862b3dbff5e36afdfad74444e26c19ca2b3
Parents: 913dc7f
Author: Alex Harui <ah...@apache.org>
Authored: Fri Nov 3 23:42:11 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Nov 3 23:42:23 2017 -0700
----------------------------------------------------------------------
flex-installer/ApproveInstaller.xml | 38 ++++++++++++++++++++++----------
1 file changed, 26 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/af24d862/flex-installer/ApproveInstaller.xml
----------------------------------------------------------------------
diff --git a/flex-installer/ApproveInstaller.xml b/flex-installer/ApproveInstaller.xml
index 8698ccf..b031ebb 100644
--- a/flex-installer/ApproveInstaller.xml
+++ b/flex-installer/ApproveInstaller.xml
@@ -53,9 +53,10 @@
<property name="package.suffix" value="tar.gz" />
<property name="rat.report" value="${basedir}/rat-report.txt"/>
- <property name="apache.rat.jar" value="apache-rat-0.8.jar" />
- <property name="apache.rat.tasks.jar" value="apache-rat-tasks-0.8.jar" />
- <property name="apache.rat.url" value="http://people.apache.org/~aharui/rat" />
+ <property name="apache.rat.jar" value="apache-rat-0.11.jar" />
+ <property name="apache.rat.tasks.jar" value="apache-rat-tasks-0.11.jar" />
+ <property name="apache.rat.url" value="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat/0.11" />
+ <property name="apache.rat.tasks.url" value="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat-tasks/0.11" />
<property name="mac.text.display" value="cat" />
<property name="win.text.display" value="type" />
@@ -97,9 +98,13 @@
<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_installer_release-candidate/lastSuccessfulBuild/artifact/out">
+ <not>
+ <isset property="rc" />
+ </not>
+ </condition>
+
<property name="package.url.path" value="https://dist.apache.org/repos/dist/dev/flex/installer/${release.version}/rc${rc}" />
<property name="package.url.name" value="apache-flex-sdk-installer-${release.version}.0-src" />
@@ -176,8 +181,12 @@
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="asc_get" />
+ </target>
+
+ <target name="asc_get" if="rc" >
<get src="${package.url.path}/${package.url.name}.${package.suffix}.asc"
- dest="${basedir}/${package.url.name}.${package.suffix}.asc" />
+ dest="${basedir}/${package.url.name}.${package.suffix}.asc" />
</target>
<target name="check-sigs" description="check md5 and gpg sigs">
@@ -190,11 +199,16 @@
</not>
</condition>
<fail message="MD5 checksum did not match" if="MD5Invalid" />
- <exec executable="gpg" failonerror="true">
- <arg value="--verify" />
- <arg value="${basedir}/${package.url.name}.${package.suffix}.asc" />
- <arg value="${basedir}/${package.url.name}.${package.suffix}" />
- </exec>
+ <echo>rc is ${rc}</echo>
+ <antcall target="gpg_check" />
+ </target>
+
+ <target name="gpg_check" if="rc">
+ <exec executable="gpg" failonerror="true">
+ <arg value="--verify" />
+ <arg value="${basedir}/${package.url.name}.${package.suffix}.asc" />
+ <arg value="${basedir}/${package.url.name}.${package.suffix}" />
+ </exec>
</target>
<target name="uncompress" depends="pre-clean, untar-file, unzip-file" />