This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch release_practice
in repository https://gitbox.apache.org/repos/asf/royale-typedefs.git
The following commit(s) were added to refs/heads/release_practice by this push:
new 3bd83ec tune up the validation
3bd83ec is described below
commit 3bd83ec8124406073b922b3f7a31cf92a098c616
Author: Alex Harui <[email protected]>
AuthorDate: Fri May 17 13:36:08 2019 -0700
tune up the validation
---
releasesteps.xml | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/releasesteps.xml b/releasesteps.xml
index 34674ef..3562da5 100644
--- a/releasesteps.xml
+++ b/releasesteps.xml
@@ -158,7 +158,7 @@
<delete file="${artifactfolder}/swcs.txt" />
<!-- this is a comma-delimited, no spaces, no-line-breaks list used to
decide which swcs
to skip in the rat-check of the binaries and which swcs to examine
before approval -->
- <property name="swcs-list"
value="ace,cordova,createjs,gcl,google_maps,jasmine,jquery,js,node"/>
+ <property name="swcs-list"
value="cordova,createjs,gcl,google_maps,jasmine,jquery,js,node"/>
<echo file="${artifactfolder}/swcs.txt" message="${swcs-list}"/>
</target>
@@ -190,6 +190,10 @@
<loadfile srcFile="${artifactfolder}/loop1.txt" property="echoFile" />
<replaceregexp file="${artifactfolder}/loop1.txt" match="^(.*),(.*)"
replace="\2" />
<loadfile srcFile="${artifactfolder}/loop1.txt" property="thisFile" />
+ <condition property="artifactid" value="googlemaps">
+ <equals arg1="${thisFile}" arg2="google_maps" />
+ </condition>
+ <property name="artifactid" value="${thisFile}" />
<antcall target="compare_files" />
<replaceregexp file="${artifactfolder}/loop.txt" match="^(.*),(.*)"
replace="\1" />
<ant antfile="releasesteps.xml" target="loopOnce" inheritAll="false">
@@ -200,32 +204,33 @@
</target>
<target name="lastone" if="islast">
<loadfile srcFile="${artifactfolder}/loop1.txt" property="thisFile" />
+ <property name="artifactid" value="${thisFile}" />
<antcall target="compare_files" />
<delete file="${artifactfolder}/loop.txt" />
<delete file="${artifactfolder}/loop1.txt" />
</target>
<target name="compare_files">
- <echo>comparing
royale-typedefs-${thisFile}-${release.version}-typedefs.swc</echo>
- <fail
message="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/typedefs/${thisFile}/${release.version}/royale-typedefs-${thisFile}-${release.version}-typedefs.swc
does not exist" >
+ <echo>comparing
royale-typedefs-${artifactid}-${release.version}-typedefs.swc</echo>
+ <fail
message="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/typedefs/royale-typedefs-${artifactid}/${release.version}/royale-typedefs-${artifactid}-${release.version}-typedefs.swc
does not exist" >
<condition>
<not>
- <resourceexists><file
file="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/typedefs/royale-typedefs-${thisFile}/${release.version}/royale-typedefs-${thisFile}-${release.version}-typedefs.swc"/></resourceexists>
+ <resourceexists><file
file="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/typedefs/royale-typedefs-${artifactid}/${release.version}/royale-typedefs-${artifactid}-${release.version}-typedefs.swc"/></resourceexists>
</not>
</condition>
</fail>
- <fail
message="${artifactfolder}/sources/${thisFile}/target/royale-typedefs-${thisFile}-${release.version}-extern.swc
does not exist" >
+ <fail
message="${artifactfolder}/sources/${thisFile}/target/royale-typedefs-${artifactid}-${release.version}-extern.swc
does not exist" >
<condition>
<not>
- <resourceexists><file
file="${artifactfolder}/sources/${thisFile}/target/royale-typedefs-${thisFile}-${release.version}-extern.swc"/></resourceexists>
+ <resourceexists><file
file="${artifactfolder}/sources/${thisFile}/target/royale-typedefs-${artifactid}-${release.version}-extern.swc"/></resourceexists>
</not>
</condition>
</fail>
<condition property="filesmatch" value="true">
- <filesmatch
file1="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/typedefs/royale-typedefs-${thisFile}/${release.version}/royale-typedefs-${thisFile}-${release.version}-typedefs.swc"
-
file2="${artifactfolder}/sources/${thisFile}/target/royale-typedefs-${thisFile}-${release.version}-extern.swc"
/>
+ <filesmatch
file1="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/typedefs/royale-typedefs-${artifactid}/${release.version}/royale-typedefs-${artifactid}-${release.version}-typedefs.swc"
+
file2="${artifactfolder}/sources/${thisFile}/target/royale-typedefs-${artifactid}-${release.version}-extern.swc"
/>
</condition>
- <fail
message="royale-typedefs-${thisFile}-${release.version}-typedefs.swc does not
match" unless="filesmatch" />
+ <fail
message="royale-typedefs-${artifactid}-${release.version}-typedefs.swc does not
match" unless="filesmatch" />
</target>
<target name="Release_Step_007_Sign" depends="get-artifact-folder">
