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:58 UTC
[royale-asjs] branch release_practice updated (d1dff08 -> 01128ff)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch release_practice
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from d1dff08 Revert "[maven-release-plugin] prepare branch release/0.9.6"
new d6ef4e8 some fixes to releasesteps
new 38ff7ab use includeClasses instead of includeSource for XML so the swf version doesn't pick up the JS-only classes like toXML
new 01128ff more fixes for release script
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
frameworks/projects/XML/pom.xml | 4 +++-
releasesteps.xml | 44 +++++++++++++----------------------------
2 files changed, 17 insertions(+), 31 deletions(-)
[royale-asjs] 03/03: more fixes for release script
Posted by ah...@apache.org.
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 01128ff94346af43af747324080afff6c94533c2
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Jun 6 13:07:14 2019 -0700
more fixes for release script
---
releasesteps.xml | 28 +++-------------------------
1 file changed, 3 insertions(+), 25 deletions(-)
diff --git a/releasesteps.xml b/releasesteps.xml
index c880d22..e058351 100644
--- a/releasesteps.xml
+++ b/releasesteps.xml
@@ -141,7 +141,7 @@
<arg value="clean" />
<arg value="install" />
<arg value="-P" />
- <arg value="release-swcs,main" />
+ <arg value="generate-swcs-for-swf,release-swcs,main" />
</exec>
</target>
@@ -237,7 +237,6 @@
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>
@@ -258,27 +257,6 @@
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>
- <fail message="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/framework/${artifactid}/${release.version}/${artifactid}-${release.version}.swc does not exist" >
- <condition>
- <not>
- <resourceexists><file file="${artifactfolder}/artifacts/archive/target/checkout/release-dir/org/apache/royale/framework/${artifactid}/${release.version}/${artifactid}-${release.version}.swc"/></resourceexists>
- </not>
- </condition>
- </fail>
- <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}/${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}/${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>
@@ -296,11 +274,11 @@
</not>
</condition>
</fail>
- <condition property="filesmatch" value="true">
+ <condition property="filesmatch2" 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}/${thisFolder}/target/${artifactid}-${release.version}-extern.swc" />
</condition>
- <fail message="${artifactid}-${release.version}-typedefs.swc does not match" unless="filesmatch" />
+ <fail message="${artifactid}-${release.version}-typedefs.swc does not match" unless="filesmatch2" />
</target>
<target name="is_theme">
<condition property="theme">
[royale-asjs] 01/03: some fixes to releasesteps
Posted by ah...@apache.org.
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>
[royale-asjs] 02/03: use includeClasses instead of includeSource
for XML so the swf version doesn't pick up the JS-only classes like toXML
Posted by ah...@apache.org.
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 38ff7ab7eacc5dbcf9f19217ad2295b23e98087e
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Jun 6 13:06:17 2019 -0700
use includeClasses instead of includeSource for XML so the swf version doesn't pick up the JS-only classes like toXML
---
frameworks/projects/XML/pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/frameworks/projects/XML/pom.xml b/frameworks/projects/XML/pom.xml
index 120bd38..a29db36 100644
--- a/frameworks/projects/XML/pom.xml
+++ b/frameworks/projects/XML/pom.xml
@@ -47,7 +47,9 @@
<manifest>${project.basedir}/src/main/resources/basic-manifest.xml</manifest>
</namespace>
</namespaces>
- <includeSources>true</includeSources>
+ <includeClasses>
+ <includeClass>XMLClasses</includeClass>
+ </includeClasses>
<skipAS>${royale.skipAS}</skipAS>
<skipExtern>true</skipExtern>
</configuration>