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 2018/01/09 08:08:16 UTC
[royale-asjs] branch develop updated (f9b4088 -> 52e9961)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from f9b4088 Update README.md with instructions about npm installation on Windows Update .gitignore
new 3734020 build maven artifacts as part of approval
new 52e9961 more ideas of post release merging
The 2 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:
ApproveRoyale.xml | 41 ++++++++++++++++++++++++++++++++++-------
releasecandidate.xml | 29 +++++++++++++++++++++++------
2 files changed, 57 insertions(+), 13 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].
[royale-asjs] 02/02: more ideas of post release merging
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 52e9961094c5c17f41002c5becc70564da4fb96c
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Jan 9 00:08:03 2018 -0800
more ideas of post release merging
---
releasecandidate.xml | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/releasecandidate.xml b/releasecandidate.xml
index d2173b7..236f9dd 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -962,47 +962,64 @@ ${my.name}
<arg value="Apache Royale ${release.version}" />
</exec>
<antcall target="release.tag" />
+ <!-- this is intended to merge the tag to master because it should have the right versions in it -->
<antcall target="merge_rc_to_master" />
+ <antcall target="get_head_of_rc_branches" />
<antcall target="update.versions" />
<antcall target="merge_rc_to_develop" />
</target>
<target name="release.tag" >
- <exec executable="${git}" dir="${basedir}" failonerror="true" >
+ <exec executable="${git}" dir="${asjs}" failonerror="true" >
<arg value="tag" />
<arg value="-a" />
<arg value="apache-royale-${release.version}" />
<arg value="-m" />
<arg value=""Official release of apache-royale-${release.version}"" />
</exec>
- <exec executable="${git}" dir="${basedir}" failonerror="true" >
+ <exec executable="${git}" dir="${asjs}" failonerror="true" >
<arg value="push" />
<arg value="--tags" />
</exec>
- <exec executable="${git}" dir="${basedir}../royale-typedefs" failonerror="true" >
+ <exec executable="${git}" dir="${typedefs}" failonerror="true" >
<arg value="tag" />
<arg value="-a" />
<arg value="apache-royale-${release.version}" />
<arg value="-m" />
<arg value=""Official release of apache-royale-${release.version}"" />
</exec>
- <exec executable="${git}" dir="${basedir}../royale-typedefs" failonerror="true" >
+ <exec executable="${git}" dir="${typedefs}" failonerror="true" >
<arg value="push" />
<arg value="--tags" />
</exec>
- <exec executable="${git}" dir="${basedir}/../royale-compiler" failonerror="true" >
+ <exec executable="${git}" dir="${compiler}" failonerror="true" >
<arg value="tag" />
<arg value="-a" />
<arg value="apache-royale-${release.version}" />
<arg value="-m" />
<arg value=""Official release of apache-royale-${release.version}"" />
</exec>
- <exec executable="${git}" dir="${basedir}/../royale-compiler" failonerror="true" >
+ <exec executable="${git}" dir="${compiler}" failonerror="true" >
<arg value="push" />
<arg value="--tags" />
</exec>
</target>
+ <target name="get_head_of_rc_branches" >
+ <exec executable="${git}" dir="${asjs}" failonerror="true" >
+ <arg value="checkout" />
+ <arg value="release/${release.version}" />
+ </exec>
+ <exec executable="${git}" dir="${typedefs}" failonerror="true" >
+ <arg value="checkout" />
+ <arg value="release/${release.version}" />
+ </exec>
+ <exec executable="${git}" dir="${compiler}" failonerror="true" >
+ <arg value="checkout" />
+ <arg value="release/${release.version}" />
+ </exec>
+ </target>
+
<target name="get-next-version">
<input
message="Enter next release version"
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.
[royale-asjs] 01/02: build maven artifacts as part of approval
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 373402040edd310d28e43305f9ccceb8ac244ab0
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Jan 9 00:07:42 2018 -0800
build maven artifacts as part of approval
---
ApproveRoyale.xml | 41 ++++++++++++++++++++++++++++++++++-------
1 file changed, 34 insertions(+), 7 deletions(-)
diff --git a/ApproveRoyale.xml b/ApproveRoyale.xml
index 58ae70a..6fecba7 100644
--- a/ApproveRoyale.xml
+++ b/ApproveRoyale.xml
@@ -69,12 +69,12 @@
<property name="build.target" value="main" />
- <available file="${env.APPDATA}/npm/jshint.cmd"
- type="file"
- property="jshint" value="${env.APPDATA}/npm/jshint.cmd" />
- <property name="jshint" value="jshint" />
+ <condition property="mvn" value="mvn.exe">
+ <isset property="isWindows" />
+ </condition>
+ <property name="mvn" value="mvn" />
- <available file="${env.ProgramFiles}/Mozilla Firefox/firefox.exe"
+ <available file="${env.ProgramFiles}/Mozilla Firefox/firefox.exe"
type="file"
property="browser" value="${env.ProgramFiles}/Mozilla Firefox/firefox.exe" />
<available file="${env.ProgramFiles(x86)}/Mozilla Firefox/firefox.exe"
@@ -142,6 +142,7 @@
<property name="package.url.name" value="apache-royale-${release.version}-src" />
<property name="bin.package.url.path" value="${package.url.path}/binaries" />
<property name="bin.package.url.name" value="apache-royale-${release.version}-bin" />
+ <property name="maven.package.url.name" value="apache-royale-${release.version}-maven-src" />
<!--
<property name="doc.package.url.path" value="${package.url.path}/doc" />
<property name="doc.package.url.name" value="apache-royale-${release.version}-asdocs" />
@@ -192,12 +193,20 @@
classpathref="anttask.classpath"/>
</target>
- <target name="main" depends="write-out-jars-list,install-rat,download,check-sigs,uncompress,rat-check,binary-rat,doc-rat,check-notices,examine-jars,build,approve" description="Perform required release approval steps">
+ <target name="main" depends="write-out-jars-list,install-rat,download,check-sigs,uncompress,copy-source-for-maven,rat-check,binary-rat,doc-rat,check-notices,examine-jars,build,approve" description="Perform required release approval steps">
</target>
- <target name="main-no-download" depends="write-out-jars-list,install-rat,check-sigs,uncompress,rat-check,binary-rat,doc-rat,check-notices,examine-jars,build,approve" description="Perform required release approval steps">
+ <target name="main-no-download" depends="write-out-jars-list,install-rat,check-sigs,uncompress,copy-source-for-maven,rat-check,binary-rat,doc-rat,check-notices,examine-jars,build,approve" description="Perform required release approval steps">
</target>
+ <target name="copy-source-for-maven">
+ <copy todir="${basedir}/${maven.package.url.name}">
+ <fileset dir="${basedir}/${package.url.name}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="test" >
<echo>${rat.report}.bin.txt</echo>
<replaceregexp file="${rat.report}.bin.txt" match="..AL.*" replace="" byline="true"/>
@@ -741,6 +750,24 @@
<property name="no.lint" value="true" />
<ant dir="${basedir}/${package.url.name}/royale-asjs" target="all" />
<ant dir="${basedir}/${package.url.name}/royale-asjs" target="examples" />
+ <exec executable="${mvn}" dir="${basedir}/${maven.package.url.name}/royale-compiler" failonerror="true" >
+ <arg value="-P" />
+ <arg value="-main,utils" />
+ <arg value="clean" />
+ <arg value="install" />
+ </exec>
+ <exec executable="${mvn}" dir="${basedir}/${maven.package.url.name}/royale-compiler" failonerror="true" >
+ <arg value="clean" />
+ <arg value="install" />
+ </exec>
+ <exec executable="${mvn}" dir="${basedir}/${maven.package.url.name}/royale-typedefs" failonerror="true" >
+ <arg value="clean" />
+ <arg value="install" />
+ </exec>
+ <exec executable="${mvn}" dir="${basedir}/${maven.package.url.name}/royale-asjs" failonerror="true" >
+ <arg value="clean" />
+ <arg value="install" />
+ </exec>
</target>
<target name="copy.downloads" if="${do.copy.downloads}" description="instead of actually downloading all of the dependencies, you can save lots of time by just copying from some other folder in some other SDK.">
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.