You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2019/06/06 20:10:59 UTC
[royale-asjs] 01/03: some fixes to releasesteps
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-asjs.git
commit d6ef4e88947159cb781d138b2f84aea6fd5f482b
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Jun 5 11:03:31 2019 -0700
some fixes to releasesteps
---
releasesteps.xml | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/releasesteps.xml b/releasesteps.xml
index f9a139c..c880d22 100644
--- a/releasesteps.xml
+++ b/releasesteps.xml
@@ -213,6 +213,10 @@
<target name="compare_files" depends="is_theme,compare_swc,compare_theme" />
<target name="compare_swc">
+ <condition property="thisFolder" value="Basic">
+ <equals arg1="${thisFile}" arg2="BasicTheme" />
+ </condition>
+ <property name="thisFolder" value="${thisFile}" />
<echo>comparing ${artifactid}-${release.version}-js.swc</echo>
<fail message="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/framework/${artifactid}/${release.version}/${artifactid}-${release.version}-js.swc does not exist" >
<condition>
@@ -224,15 +228,16 @@
<fail message="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFile}/target/${artifactid}-${release.version}-js.swc does not exist" >
<condition>
<not>
- <resourceexists><file file="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFile}/target/${artifactid}-${release.version}-js.swc"/></resourceexists>
+ <resourceexists><file file="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFolder}/target/${artifactid}-${release.version}-js.swc"/></resourceexists>
</not>
</condition>
</fail>
<condition property="filesmatch" value="true">
<filesmatch file1="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/framework/${artifactid}/${release.version}/${artifactid}-${release.version}-js.swc"
- file2="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFile}/target/${artifactid}-${release.version}-js.swc" />
+ file2="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFolder}/target/${artifactid}-${release.version}-js.swc" />
</condition>
<fail message="${artifactid}-${release.version}-js.swc does not match" unless="filesmatch" />
+ <!--
<echo>comparing ${artifactid}-${release.version}-swf.swc</echo>
<fail message="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/framework/${artifactid}/${release.version}/${artifactid}-${release.version}-swf.swc does not exist" >
<condition>
@@ -241,16 +246,16 @@
</not>
</condition>
</fail>
- <fail message="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFile}/target/${artifactid}-${release.version}-js.swc does not exist" >
+ <fail message="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFile}/target/${artifactid}-${release.version}-swf.swc does not exist" >
<condition>
<not>
- <resourceexists><file file="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFile}/target/${artifactid}-${release.version}-swf.swc"/></resourceexists>
+ <resourceexists><file file="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFolder}/target/${artifactid}-${release.version}-swf.swc"/></resourceexists>
</not>
</condition>
</fail>
<condition property="filesmatch1" value="true">
<filesmatch file1="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/framework/${artifactid}/${release.version}/${artifactid}-${release.version}-swf.swc"
- file2="${artifactfolder}/sources/${thisFile}/target/${artifactid}-${release.version}-swf.swc" />
+ file2="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFolder}/target/${artifactid}-${release.version}-swf.swc" />
</condition>
<fail message="${artifactid}-${release.version}-swf.swc does not match" unless="filesmatch1" />
<echo>comparing ${artifactid}-${release.version}.swc</echo>
@@ -264,15 +269,16 @@
<fail message="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFile}/target/${artifactid}-${release.version}.swc does not exist" >
<condition>
<not>
- <resourceexists><file file="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFile}/target/${artifactid}-${release.version}.swc"/></resourceexists>
+ <resourceexists><file file="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFolder}/target/${artifactid}-${release.version}.swc"/></resourceexists>
</not>
</condition>
</fail>
<condition property="filesmatch2" value="true">
<filesmatch file1="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/framework/${artifactid}/${release.version}/${artifactid}-${release.version}.swc"
- file2="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFile}/target/${artifactid}-${release.version}.swc" />
+ file2="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFolder}/target/${artifactid}-${release.version}.swc" />
</condition>
<fail message="${artifactid}-${release.version}.swc does not match" unless="filesmatch2" />
+ -->
</target>
<target name="compare_theme" if="theme">
<echo>comparing ${artifactid}-${release.version}-typedefs.swc</echo>
@@ -286,13 +292,13 @@
<fail message="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFile}/target/${artifactid}-${release.version}-extern.swc does not exist" >
<condition>
<not>
- <resourceexists><file file="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFile}/target/${artifactid}-${release.version}-extern.swc"/></resourceexists>
+ <resourceexists><file file="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFolder}/target/${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/framework/${artifactid}/${release.version}/${artifactid}-${release.version}-typedefs.swc"
- file2="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFile}/target/${artifactid}-${release.version}-extern.swc" />
+ file2="${artifactfolder}/sources/frameworks/${theme_or_project}/${thisFolder}/target/${artifactid}-${release.version}-extern.swc" />
</condition>
<fail message="${artifactid}-${release.version}-typedefs.swc does not match" unless="filesmatch" />
</target>