Repository: flex-utilities
Updated Branches:
refs/heads/develop fd2ca78d1 -> 1fd901008
allow skipping of ASC checks
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/d573767c
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/d573767c
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/d573767c
Branch: refs/heads/develop
Commit: d573767cbe44d06d44fbe9833e70651578e5166b
Parents: fd2ca78
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 5 23:40:31 2014 +0000
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 5 23:41:47 2014 +0000
----------------------------------------------------------------------
TourDeFlex/ApproveTDF.xml | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d573767c/TourDeFlex/ApproveTDF.xml
----------------------------------------------------------------------
diff --git a/TourDeFlex/ApproveTDF.xml b/TourDeFlex/ApproveTDF.xml
index c3caa24..92302c5 100644
--- a/TourDeFlex/ApproveTDF.xml
+++ b/TourDeFlex/ApproveTDF.xml
@@ -96,11 +96,8 @@
<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"/>
-
- <property name="package.url.path" value="https://dist.apache.org/repos/dist/dev/flex/TourDeFlex/${release.version}/rc${rc}" />
+
+ <property name="package.url.path" value="http://apacheflexbuild.cloudapp.net:8080/job/flex-utilities_tour-de-flex-release/lastSuccessfulBuild/artifact/TourDeFlex/TourDeFlex3/out" />
<property name="package.url.name" value="apache-flex-tour-de-flex-component-explorer-${release.version}-src" />
<condition property="zip.compressed">
@@ -171,16 +168,18 @@
</antcall>
</target>
- <target name="download" description="download the release package">
+ <target name="download" depends="download-asc" description="download the release package">
<get src="${package.url.path}/${package.url.name}.${package.suffix}"
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" />
- <get src="${package.url.path}/${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">
+ <target name="download-asc" unless="no.asc" description="download the release package">
+ </target>
+
+ <target name="check-md5" description="check md5">
+ <echo message="Checking MD5..."/>
<replace file="${basedir}/${package.url.name}.${package.suffix}.md5"
token=" " />
<checksum file="${basedir}/${package.url.name}.${package.suffix}" algorithm="md5" verifyproperty="md5.ok" />
@@ -190,6 +189,9 @@
</not>
</condition>
<fail message="MD5 checksum did not match" if="MD5Invalid" />
+ </target>
+
+ <target name="check-sigs" depends="check-md5" unless="no.asc" description="check md5 and gpg sigs">
<exec executable="gpg" failonerror="true">
<arg value="--verify" />
<arg value="${basedir}/${package.url.name}.${package.suffix}.asc" />
@@ -197,6 +199,7 @@
</exec>
</target>
+
<target name="uncompress" depends="pre-clean, untar-file, unzip-file" />
<target name="pre-clean" description="remove old uncompressed package" >
@@ -362,5 +365,10 @@ No unapproved binaries: ${rat.binaries.ok}
<equals arg1="-1" arg2="${vote}"/>
</condition>
</fail>
+ <antcall target="no-asc" />
+ </target>
+
+ <target name="no-asc" if="no.asc" >
+ <echo>PGP signature not checked</echo>
</target>
</project>
more fixes to allow script to work on nightly builds
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/1fd90100
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/1fd90100
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/1fd90100
Branch: refs/heads/develop
Commit: 1fd9010088998fcd58f4cb685cea7d64934d9d6a
Parents: d573767
Author: Alex Harui <ah...@apache.org>
Authored: Thu Nov 6 05:42:04 2014 +0000
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Nov 6 05:42:04 2014 +0000
----------------------------------------------------------------------
TourDeFlex/ApproveTDF.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1fd90100/TourDeFlex/ApproveTDF.xml
----------------------------------------------------------------------
diff --git a/TourDeFlex/ApproveTDF.xml b/TourDeFlex/ApproveTDF.xml
index 92302c5..41e07fc 100644
--- a/TourDeFlex/ApproveTDF.xml
+++ b/TourDeFlex/ApproveTDF.xml
@@ -230,6 +230,9 @@
<exclude name="**/*.mp3"/>
<exclude name="**/*.flv"/>
<exclude name="installer/build.number"/>
+ <exclude name="**/swfobject.js"/>
+ <exclude name="CONTRIBUTORS"/>
+ <exclude name="CONTRIBUTING"/>
</fileset>
</rat:report>
<antcall target="display-text" >