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/02 17:38:41 UTC
[royale-asjs] branch develop updated (00ef033 -> b22a1bc)
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 00ef033 Implement set positioner on IUIBase implementers
new 9089c75 more fixes for release script
new b22a1bc fix up scm info
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:
pom.xml | 6 +++---
releasecandidate.xml | 44 ++++++++++++++++++++++++++++----------------
2 files changed, 31 insertions(+), 19 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].
[royale-asjs] 01/02: 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 develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 9089c75b8d1c0dd8cc77665c08e07a5bc43f788e
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Jan 2 09:35:31 2018 -0800
more fixes for release script
---
releasecandidate.xml | 44 ++++++++++++++++++++++++++++----------------
1 file changed, 28 insertions(+), 16 deletions(-)
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 5e060f9..341426d 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -139,14 +139,16 @@
<available file="${basedir}/../royale-compiler"
type="dir"
- property="compiler"/>
+ property="compiler"
+ value="${basedir}/../royale-compiler" />
<fail message="Could not locate royale-compiler repo. It must be a sibling to royale-asjs"
unless="compiler"/>
<available file="${basedir}/../royale-typedefs"
type="dir"
- property="typedefs"/>
+ property="typedefs"
+ value="${basedir}/../royale-typedefs"/>
<fail message="Could not locate royale-typedefs repo. It must be a sibling to royale-asjs"
unless="typedefs"/>
@@ -233,6 +235,7 @@
<!-- clean out everything generated from prior Maven builds -->
<exec executable="${mvn}" dir="${basedir}" failonerror="true" >
<arg value="clean" />
+ </exec>
<!-- get the latest sources before making a branch. This should fail if you have local changes -->
<exec executable="${git}" dir="${typedefs}" failonerror="true" >
<arg value="pull" />
@@ -279,31 +282,44 @@
</target>
<target name="check-maven-branch.compiler" >
- <exec executable="${git}" dir="${compiler}" failonerror="true" outputproperty="git.branches">
+ <exec executable="${git}" dir="${compiler}" failonerror="true" outputproperty="git.compiler.branches">
<arg value="branch" />
<arg value="--all" />
</exec>
<condition property="compiler.branch.exists">
- <contains string="${git.branches}" substring="${release.version}" />
+ <contains string="${git.compiler.branches}" substring="${release.version}" />
</condition>
</target>
<target name="check-maven-branch.typedefs" >
- <exec executable="${git}" dir="${typedefs}" failonerror="true" outputproperty="git.branches">
+ <exec executable="${git}" dir="${typedefs}" failonerror="true" outputproperty="git.typedefs.branches">
<arg value="branch" />
<arg value="--all" />
</exec>
<condition property="typedefs.branch.exists">
- <contains string="${git.branches}" substring="${release.version}" />
+ <contains string="${git.typedefs.branches}" substring="${release.version}" />
</condition>
</target>
<target name="maven.branch.compiler" depends="check-maven-branch.compiler" unless="compiler.branch.exists">
<exec executable="${mvn}" dir="${compiler}" failonerror="true" >
<arg value="release:branch" />
+ <arg value="-DdryRun=true" />
<arg value="-DbranchName=release/${release.version}" />
- <arg value="-DupdateBranchVersions=true" />
- <arg value="-DupdateWorkingCopyVersions=false" />
+ <arg value="-Dproject.rel.org.apache.royale:compiler-build-tools=1.0.0" />
+ <arg value="-Dproject.rel.org.apache.royale:compiler-jburg-types=1.0.0" />
+ <arg value="-Dproject.rel.org.apache.royale:compiler-common=${release.version}" />
+ <arg value="-Dproject.rel.org.apache.royale:compiler-externc=${release.version}" />
+ <arg value="-Dproject.rel.org.apache.royale:compiler=${release.version}" />
+ <arg value="-Dproject.rel.org.apache.royale:compiler-jx=${release.version}" />
+ <arg value="-Dproject.rel.org.apache.royale:compiler-test-utils=${release.version}" />
+ <arg value="-Dproject.rel.org.apache.royale:swfutils=${release.version}" />
+ <arg value="-Dproject.rel.org.apache.royale:debugger=${release.version}" />
+ <arg value="-Dproject.rel.org.apache.royale:flex-compiler-oem=${release.version}" />
+ <arg value="-Dproject.rel.org.apache.royale:royale-ant-tasks=${release.version}" />
+ <arg value="-Dproject.rel.org.apache.royale:royale-maven-plugin=${release.version}" />
+ <arg value="-Dproject.dev.org.apache.royale:compiler-build-tools=1.0.0" />
+ <arg value="-Dproject.dev.org.apache.royale:compiler-jburg-types=1.0.0" />
</exec>
</target>
@@ -337,11 +353,11 @@
<target name="royale.compiler" depends="maven.branch.compiler,maven.prepare.compiler,maven.perform.compiler" />
<target name="update.typedefs.pom" >
- <replaceregexp file="${typedefs}/poml.xml"byline="true" encoding="UTF-8">
+ <replaceregexp file="${typedefs}/poml.xml" byline="true" encoding="UTF-8">
<regexp pattern="royale.compiler.version>*.<"/>
<substitution expression="royale.compiler.version>${release.version}<"/>
</replaceregexp>
- <replaceregexp file="${typedefs}/poml.xml"byline="true" encoding="UTF-8">
+ <replaceregexp file="${typedefs}/poml.xml" byline="true" encoding="UTF-8">
<regexp pattern="royale.build-tools.version>*.<"/>
<substitution expression="royale.build-tools.version>1.0.0<"/>
</replaceregexp>
@@ -351,8 +367,6 @@
<exec executable="${mvn}" dir="${typedefs}" failonerror="true" >
<arg value="release:branch" />
<arg value="-DbranchName=release/${release.version}" />
- <arg value="-DupdateBranchVersions=true" />
- <arg value="-DupdateWorkingCopyVersions=false" />
</exec>
</target>
@@ -375,11 +389,11 @@
<target name="royale.typedefs" depends="update.typedefs.pom,maven.branch.typedefs,maven.prepare.typedefs,maven.perform.typedefs" />
<target name="update.framework.pom" >
- <replaceregexp file="${basedir}/poml.xml"byline="true" encoding="UTF-8">
+ <replaceregexp file="${basedir}/poml.xml" byline="true" encoding="UTF-8">
<regexp pattern="royale.compiler.version>*.<"/>
<substitution expression="royale.compiler.version>${release.version}<"/>
</replaceregexp>
- <replaceregexp file="${basedir}/poml.xml"byline="true" encoding="UTF-8">
+ <replaceregexp file="${basedir}/poml.xml" byline="true" encoding="UTF-8">
<regexp pattern="royale.build-tools.version>*.<"/>
<substitution expression="royale.build-tools.version>1.0.0<"/>
</replaceregexp>
@@ -389,8 +403,6 @@
<exec executable="${mvn}" dir="${basedir}" failonerror="true" >
<arg value="release:branch" />
<arg value="-DbranchName=release/${release.version}" />
- <arg value="-DupdateBranchVersions=true" />
- <arg value="-DupdateWorkingCopyVersions=false" />
</exec>
</target>
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.
[royale-asjs] 02/02: fix up scm info
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 b22a1bc075a236e86db12551414c619d1b14e69a
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Jan 2 09:38:26 2018 -0800
fix up scm info
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 272a1ec..a9d30bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,9 +43,9 @@
-->
<scm>
- <connection>scm:git:https://github.com/apache/royale-asjs.git</connection>
- <developerConnection>scm:git:https://github.com/apache/royale-asjs.git</developerConnection>
- <url>https://github.com/apache/royale-asjs</url>
+ <connection>scm:git:git@github.com:apache/royale-asjs.git</connection>
+ <developerConnection>scm:git:git@github.com:apache/royale-asjs.git</developerConnection>
+ <url>scm:git:git@github.com:apache/royale-asjs.git</url>
<tag>HEAD</tag>
</scm>
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.