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/04 05:05:23 UTC
[royale-asjs] branch develop updated (e8faaac -> ce9e35f)
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 e8faaac Fixes issue with retaining selection and rollover using the Dynamic beads for ArrayList.
new 9b10f83 make_branches worked on dryrun
new 5d226b9 make_branches seemed to work without pushing
new ce9e35f more improvements to 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:
releasecandidate.xml | 297 ++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 233 insertions(+), 64 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].
[royale-asjs] 01/03: make_branches worked on dryrun
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 9b10f83331ab3a56b0d481ce9c2c9aad2e7e778a
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Jan 2 11:41:01 2018 -0800
make_branches worked on dryrun
---
releasecandidate.xml | 99 +++++++++++++++++++++++++++++++---------------------
1 file changed, 60 insertions(+), 39 deletions(-)
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 121fed9..8767698 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -17,7 +17,12 @@
limitations under the License.
-->
-
+<!--
+ Usage: make_branches -makes release branches for all 3 repos
+ maven -produces the Maven artifacts and stages them on the Nexus repo
+ main -produces the Ant artifacts and prepares emails to be sent
+ release -run this after vote passes to move stuff to distribution folders and tag the release.
+ -->
<project name="CreateRoyaleReleaseCandidate" default="main" basedir=".">
<property file="${basedir}/local.properties" />
@@ -72,7 +77,7 @@
type="file"
property="found.build.properties" value="true" />
- <fail message="This script should be copied into an empty folder and run from there. Run the 'maven' target first then start with an empty folder again and run the 'main' target"
+ <fail message="This script should be copied into an empty folder and run from there. Run the maven-branch target to create release branches or run the 'maven' target to start creating an release candidate, then start with an empty folder again and run the 'main' target to complete the release candidate."
if="found.build.properties"/>
</target>
@@ -146,24 +151,6 @@
-Dbrowser=<path-to-browser>"
unless="browser"/>
- <!--
- <available file="${basedir}/../royale-compiler"
- type="dir"
- 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"
- value="${basedir}/../royale-typedefs"/>
-
- <fail message="Could not locate royale-typedefs repo. It must be a sibling to royale-asjs"
- unless="typedefs"/>
- -->
-
<condition property="svn" value="svn.exe">
<isset property="isWindows" />
</condition>
@@ -249,10 +236,11 @@
<target name="check-royale-asjs">
<available file="${basedir}/royale-asjs"
type="dir"
- property="royale-asjs-exists"/>
+ property="asjs"
+ value="${basedir}/royale-asjs"/>
</target>
- <target name="clone-asjs" depends="check-royale-asjs" unless="royale-asjs-exists">
+ <target name="clone-asjs" depends="check-royale-asjs" unless="asjs">
<echo>cloning royale-asjs repo into ${basedir}/royale-asjs</echo>
<exec executable="git" failonerror="true" dir="${basedir}">
<arg value="clone" />
@@ -263,16 +251,25 @@
<arg value="checkout" />
<arg value="${branch.name}" />
</exec>
+ <available file="${basedir}/royale-asjs"
+ type="dir"
+ property="asjs"
+ value="${basedir}/royale-asjs"/>
+
+ <fail message="Could not locate royale-asjs repo."
+ unless="asjs"/>
+
<echo>changed to branch ${branch.name}</echo>
</target>
<target name="check-royale-compiler">
<available file="${basedir}/royale-compiler"
type="dir"
- property="royale-compiler-exists"/>
+ property="compiler"
+ value="${basedir}/royale-compiler" />
</target>
- <target name="clone-compiler" depends="check-royale-compiler" unless="royale-compiler-exists">
+ <target name="clone-compiler" depends="check-royale-compiler" unless="compiler">
<echo>cloning royale-compiler repo into ${basedir}/royale-compiler</echo>
<exec executable="git" failonerror="true" dir="${basedir}">
<arg value="clone" />
@@ -283,16 +280,25 @@
<arg value="checkout" />
<arg value="${branch.name}" />
</exec>
+ <available file="${basedir}/royale-compiler"
+ type="dir"
+ property="compiler"
+ value="${basedir}/royale-compiler" />
+
+ <fail message="Could not locate royale-compiler repo."
+ unless="compiler"/>
+
<echo>changed to branch ${branch.name}</echo>
</target>
<target name="check-royale-typedefs">
<available file="${basedir}/royale-typedefs"
type="dir"
- property="royale-typedefs-exists"/>
+ property="typedefs"
+ value="${basedir}/royale-typedefs"/>
</target>
- <target name="clone-typedefs" depends="check-royale-typedefs" unless="royale-typedefs-exists">
+ <target name="clone-typedefs" depends="check-royale-typedefs" unless="typedefs">
<echo>cloning royale-typedefs repo into ${basedir}/royale-typedefs</echo>
<exec executable="git" failonerror="true" dir="${basedir}">
<arg value="clone" />
@@ -303,6 +309,14 @@
<arg value="checkout" />
<arg value="${branch.name}" />
</exec>
+ <available file="${basedir}/royale-typedefs"
+ type="dir"
+ property="typedefs"
+ value="${basedir}/royale-typedefs"/>
+
+ <fail message="Could not locate royale-typedefs repo."
+ unless="typedefs"/>
+
<echo>changed to branch ${branch.name}</echo>
</target>
@@ -321,17 +335,22 @@
message="Enter Maven ASJS Staging Repo folder name"
addproperty="maven.asjs.folder"/>
</target>
+ <target name="verify-task">
+ <input
+ message="This task will build a release candidate. It expects that the make_branches and maven targets ahve been run first. Press any <enter> to enter the location of the Maven source artifacts."
+ />
+ </target>
<target name="get-maven-folders" depends="get-maven-compiler-folder, get-maven-typedefs-folder,get-maven-asjs-folder" />
- <target name="main" depends="check-empty-folder,check-name-and-svn,install-rat,credentials,get-maven-folders,get-maven-source-artifacts" description="Perform packaging steps">
+ <target name="main" depends="check-empty-folder,verify-task,check-name-and-svn,install-rat,credentials,get-maven-folders,get-maven-source-artifacts" description="Perform packaging steps">
<antcall target="check-new-version" />
<antcall target="stage.rc" />
<antcall target="push.rc" />
</target>
<target name="check-maven-branch" >
- <exec executable="${git}" dir="${basedir}" failonerror="true" outputproperty="git.branches">
+ <exec executable="${git}" dir="${asjs}" failonerror="true" outputproperty="git.branches">
<arg value="branch" />
<arg value="--all" />
</exec>
@@ -416,11 +435,11 @@
<target name="royale.compiler" depends="clone-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}/pom.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}/pom.xml" byline="true" encoding="UTF-8">
<regexp pattern="royale.build-tools.version>*.<"/>
<substitution expression="royale.build-tools.version>1.0.0<"/>
</replaceregexp>
@@ -429,6 +448,7 @@
<target name="maven.branch.typedefs" depends="clone-typedefs,check-maven-branch.typedefs" unless="typedefs.branch.exists">
<exec executable="${mvn}" dir="${typedefs}" failonerror="true" >
<arg value="release:branch" />
+ <arg value="-DdryRun=true" />
<arg value="-DbranchName=release/${release.version}" />
</exec>
</target>
@@ -453,26 +473,27 @@
<target name="royale.typedefs" depends="clone-typedefs,update.typedefs.pom,maven.prepare.typedefs,maven.perform.typedefs" />
<target name="update.framework.pom" >
- <replaceregexp file="${basedir}/poml.xml" byline="true" encoding="UTF-8">
+ <replaceregexp file="${asjs}/pom.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="${asjs}/pom.xml" byline="true" encoding="UTF-8">
<regexp pattern="royale.build-tools.version>*.<"/>
<substitution expression="royale.build-tools.version>1.0.0<"/>
</replaceregexp>
</target>
<target name="maven.branch.framework" depends="clone-asjs,check-maven-branch" unless="branch.exists">
- <exec executable="${mvn}" dir="${basedir}" failonerror="true" >
+ <exec executable="${mvn}" dir="${asjs}" failonerror="true" >
<arg value="release:branch" />
+ <arg value="-DdryRun=true" />
<arg value="-DbranchName=release/${release.version}" />
</exec>
</target>
<target name="maven.prepare">
<!-- http://maven.apache.org/maven-release/maven-release-plugin/examples/prepare-release.html -->
- <exec executable="${mvn}" dir="${basedir}" failonerror="true" >
+ <exec executable="${mvn}" dir="${asjs}" failonerror="true" >
<arg value="--batch-mode" />
<arg value="release:prepare" />
<arg value="-Dtag=org.apache.royale.framework-${release.version}-${rc}" />
@@ -482,7 +503,7 @@
<target name="maven.perform">
<!-- http://maven.apache.org/maven-release/maven-release-plugin/examples/perform-release.html -->
- <exec executable="${mvn}" dir="${basedir}" failonerror="true" >
+ <exec executable="${mvn}" dir="${asjs}" failonerror="true" >
<arg value="release:perform" />
</exec>
</target>
@@ -529,12 +550,12 @@
<mkdir dir="${dist.dev}/royale/${release.version}/rc${rc}/binaries" />
<!--<mkdir dir="${dist.dev}/royale/${release.version}/rc${rc}/doc" />-->
<copy todir="${dist.dev}/royale/${release.version}/rc${rc}" >
- <fileset dir="${basedir}/royale-asjs/out" >
+ <fileset dir="${asjs}/out" >
<include name="apache-royale-${release.version}-src*" />
</fileset>
</copy>
<copy todir="${dist.dev}/royale/${release.version}/rc${rc}/binaries" >
- <fileset dir="${basedir}/royale-asjs/out" >
+ <fileset dir="${asjs}/out" >
<include name="apache-royale-${release.version}-bin*" />
</fileset>
</copy>
@@ -543,8 +564,8 @@
<include name="apache-royale-${release.version}-asdoc*" />
</fileset>
</copy>-->
- <copy file="${basedir}/releasemgr/README" tofile="${dist.dev}/royale/${release.version}/rc${rc}/READme" />
- <copy file="${basedir}/ApproveRoyale.xml" tofile="${dist.dev}/royale/${release.version}/rc${rc}/ApproveRoyale.xml" />
+ <copy file="${asjs}/releasemgr/README" tofile="${dist.dev}/royale/${release.version}/rc${rc}/READme" />
+ <copy file="${asjs}/ApproveRoyale.xml" tofile="${dist.dev}/royale/${release.version}/rc${rc}/ApproveRoyale.xml" />
</target>
<target name="push.rc" >
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.
[royale-asjs] 02/03: make_branches seemed to work without pushing
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 5d226b9aaa1725cd4e08d87c51b37444cb85091d
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Jan 2 11:46:54 2018 -0800
make_branches seemed to work without pushing
---
releasecandidate.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 8767698..3ace651 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -383,7 +383,7 @@
<exec executable="${mvn}" dir="${compiler}" failonerror="true" >
<arg value="--batch-mode" />
<arg value="release:branch" />
- <arg value="-DdryRun=true" />
+ <arg value="-DpushChanges=false" />
<arg value="-DbranchName=release/${release.version}" />
<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" />
@@ -448,7 +448,7 @@
<target name="maven.branch.typedefs" depends="clone-typedefs,check-maven-branch.typedefs" unless="typedefs.branch.exists">
<exec executable="${mvn}" dir="${typedefs}" failonerror="true" >
<arg value="release:branch" />
- <arg value="-DdryRun=true" />
+ <arg value="-DpushChanges=false" />
<arg value="-DbranchName=release/${release.version}" />
</exec>
</target>
@@ -486,7 +486,7 @@
<target name="maven.branch.framework" depends="clone-asjs,check-maven-branch" unless="branch.exists">
<exec executable="${mvn}" dir="${asjs}" failonerror="true" >
<arg value="release:branch" />
- <arg value="-DdryRun=true" />
+ <arg value="-DpushChanges=false" />
<arg value="-DbranchName=release/${release.version}" />
</exec>
</target>
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.
[royale-asjs] 03/03: more improvements to 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 ce9e35f87a3cfe5a9f7d5a584a88d304cffcbd89
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Jan 3 21:04:57 2018 -0800
more improvements to release script
---
releasecandidate.xml | 204 ++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 176 insertions(+), 28 deletions(-)
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 3ace651..d132a2a 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -81,6 +81,21 @@
if="found.build.properties"/>
</target>
+ <target name="check-no-repos" >
+ <available file="${basedir}/royale-asjs"
+ type="dir"
+ property="found.clone" value="true" />
+ <available file="${basedir}/royale-compiler"
+ type="dir"
+ property="found.clone" value="true" />
+ <available file="${basedir}/royale-typedefs"
+ type="dir"
+ property="found.clone" value="true" />
+
+ <fail message="This script should be copied into an empty folder and run from there. Run the maven-branch target to create release branches or run the 'maven' target to start creating an release candidate, then start with an empty folder again and run the 'main' target to complete the release candidate."
+ if="found.clone"/>
+ </target>
+
<fail message="The ANT_HOME environment variable is not set."
unless="env.ANT_HOME"/>
@@ -343,12 +358,57 @@
<target name="get-maven-folders" depends="get-maven-compiler-folder, get-maven-typedefs-folder,get-maven-asjs-folder" />
- <target name="main" depends="check-empty-folder,verify-task,check-name-and-svn,install-rat,credentials,get-maven-folders,get-maven-source-artifacts" description="Perform packaging steps">
+ <target name="main" depends="check-empty-folder,check-no-repos,verify-task,check-name-and-svn,install-rat,credentials,get-maven-folders,get-maven-source-artifacts" description="Perform packaging steps">
<antcall target="check-new-version" />
<antcall target="stage.rc" />
<antcall target="push.rc" />
</target>
+ <target name="checkout-release-branch" >
+ <exec executable="${git}" dir="${asjs}" failonerror="false">
+ <arg value="checkout" />
+ <arg value="${branch.name}" />
+ </exec>
+ <exec executable="${git}" dir="${asjs}" failonerror="true" outputproperty="git.status">
+ <arg value="status" />
+ </exec>
+ <condition property="on.branch">
+ <contains string="${git.status}" substring="branch ${branch.name}" />
+ </condition>
+ <fail message="Not on release branch ${branch.name) in ${asjs}."
+ unless="on.branch"/>
+ </target>
+
+ <target name="checkout-release-branch-compiler" >
+ <exec executable="${git}" dir="${compiler}" failonerror="false">
+ <arg value="checkout" />
+ <arg value="${branch.name}" />
+ </exec>
+ <exec executable="${git}" dir="${compiler}" failonerror="true" outputproperty="git.status.compiler">
+ <arg value="status" />
+ </exec>
+ <condition property="on.branch.compiler">
+ <contains string="${git.status.compiler}" substring="branch ${branch.name}" />
+ </condition>
+ <fail message="Not on release branch ${branch.name) in ${compiler}."
+ unless="on.branch.compiler"/>
+ </target>
+
+ <target name="checkout-release-branch-typedefs" >
+ <exec executable="${git}" dir="${typedefs}" failonerror="false">
+ <arg value="checkout" />
+ <arg value="${branch.name}" />
+ </exec>
+ <exec executable="${git}" dir="${typedefs}" failonerror="true" outputproperty="git.status.typedefs">
+ <arg value="status" />
+ </exec>
+ <condition property="on.branch.typedefs">
+ <contains string="${git.status.typedefs}" substring="branch ${branch.name}" />
+ </condition>
+ <fail message="Not on release branch ${branch.name) in ${typedefs}."
+ unless="on.branch.typedefs"/>
+ </target>
+
<target name="check-maven-branch" >
<exec executable="${git}" dir="${asjs}" failonerror="true" outputproperty="git.branches">
<arg value="branch" />
@@ -383,31 +443,108 @@
<exec executable="${mvn}" dir="${compiler}" failonerror="true" >
<arg value="--batch-mode" />
<arg value="release:branch" />
- <arg value="-DpushChanges=false" />
+ <!--<arg value="-DpushChanges=false" />-->
<arg value="-DbranchName=release/${release.version}" />
- <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>
+ <target name="git-commit-and-push-utils-if-modified" if="utils.modification.exists">
+ <exec executable="${git}" dir="${compiler}" failonerror="true" >
+ <arg value="add" />
+ <arg value="compiler-jburg-types/pom.xml" />
+ </exec>
+ <exec executable="${git}" dir="${compiler}" failonerror="true" >
+ <arg value="add" />
+ <arg value="compiler-build-tools/pom.xml" />
+ </exec>
+ <exec executable="${git}" dir="${compiler}" failonerror="true" >
+ <arg value="add" />
+ <arg value="pom.xml" />
+ </exec>
+ <exec executable="${git}" dir="${compiler}" failonerror="true" >
+ <arg value="commit" />
+ <arg value="-m" />
+ <arg value="remove SNAPSHOT from compiler-jburg-types and compiler-build-tools versions" />
+ </exec>
+ </target>
+
+ <target name="git-commit-and-push-utils">
+ <exec executable="${git}" dir="${compiler}" failonerror="true" outputproperty="git.status.utils">
+ <arg value="status" />
+ </exec>
+ <condition property="utils.modification.exists">
+ <contains string="${git.status.utils}" substring="modified:" />
+ </condition>
+ <antcall target="git-commit-and-push-utils-if-modified" />
+ </target>
+
+ <target name="git-commit-and-push-typedefs-if-modified" if="typedefs.modification.exists">
+ <exec executable="${git}" dir="${typedefs}" failonerror="true" >
+ <arg value="add" />
+ <arg value="pom.xml" />
+ </exec>
+ <exec executable="${git}" dir="${typedefs}" failonerror="true" >
+ <arg value="commit" />
+ <arg value="-m" />
+ <arg value="remove SNAPSHOT from compiler-build-tools versions" />
+ </exec>
+ </target>
+
+ <target name="git-commit-and-push-typedefs">
+ <exec executable="${git}" dir="${typedefs}" failonerror="true" outputproperty="git.status.typedefs">
+ <arg value="status" />
+ </exec>
+ <condition property="typedefs.modification.exists">
+ <contains string="${git.status.typedefs}" substring="modified:" />
+ </condition>
+ <antcall target="git-commit-and-push-typedefs-if-modified" />
+ </target>
+
+ <target name="git-commit-and-push-asjs-if-modified" if="asjs.modification.exists">
+ <exec executable="${git}" dir="${asjs}" failonerror="true" >
+ <arg value="add" />
+ <arg value="pom.xml" />
+ </exec>
+ <exec executable="${git}" dir="${asjs}" failonerror="true" >
+ <arg value="commit" />
+ <arg value="-m" />
+ <arg value="remove SNAPSHOT from compiler-build-tools versions" />
+ </exec>
+ </target>
+
+ <target name="git-commit-and-push-asjs">
+ <exec executable="${git}" dir="${asjs}" failonerror="true" outputproperty="git.status.asjs">
+ <arg value="status" />
+ </exec>
+ <condition property="asjs.modification.exists">
+ <contains string="${git.status.asjs}" substring="modified:" />
+ </condition>
+ <antcall target="git-commit-and-push-asjs-if-modified" />
+ </target>
+
<target name="maven.prepare.compiler">
+ <!-- use production versions for compiler-build-tools and compiler-jburg-types -->
+ <replace token="1.0.0-SNAPSHOT" value="1.0.0">
+ <fileset dir="${compiler}" >
+ <include name="compiler-build-tools/pom.xml" />
+ <include name="compiler-jburg-types/pom.xml" />
+ <include name="pom.xml" />
+ </fileset>
+ </replace>
+ <!-- build these modules -->
+ <exec executable="${mvn}" dir="${compiler}" failonerror="true" >
+ <arg value="clean" />
+ <arg value="install" />
+ <arg value="-P" />
+ <arg value="-main,utils" />
+ </exec>
+ <antcall target="git-commit-and-push-utils" />
<!-- http://maven.apache.org/maven-release/maven-release-plugin/examples/prepare-release.html -->
<exec executable="${mvn}" dir="${compiler}" failonerror="true" >
<arg value="--batch-mode" />
<arg value="release:prepare" />
- <arg value="-Dtag=org.apache.royale.compiler-${release.version}-${rc}" />
+ <!--<arg value="-DpushChanges=false" />-->
+ <arg value="-Dtag=org.apache.royale.compiler-${release.version}-rc${rc}" />
<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}" />
@@ -429,26 +566,28 @@
<!-- http://maven.apache.org/maven-release/maven-release-plugin/examples/perform-release.html -->
<exec executable="${mvn}" dir="${compiler}" failonerror="true" >
<arg value="release:perform" />
+ <!--<arg value="-DpushChanges=false" />-->
</exec>
</target>
- <target name="royale.compiler" depends="clone-compiler,maven.prepare.compiler,maven.perform.compiler" />
+ <target name="royale.compiler" depends="clone-compiler,checkout-release-branch-compiler,maven.prepare.compiler,maven.perform.compiler" />
<target name="update.typedefs.pom" >
<replaceregexp file="${typedefs}/pom.xml" byline="true" encoding="UTF-8">
- <regexp pattern="royale.compiler.version>*.<"/>
+ <regexp pattern="royale.compiler.version>.*<"/>
<substitution expression="royale.compiler.version>${release.version}<"/>
</replaceregexp>
<replaceregexp file="${typedefs}/pom.xml" byline="true" encoding="UTF-8">
- <regexp pattern="royale.build-tools.version>*.<"/>
+ <regexp pattern="royale.build-tools.version>.*<"/>
<substitution expression="royale.build-tools.version>1.0.0<"/>
</replaceregexp>
+ <antcall target="git-commit-and-push-typedefs" />
</target>
<target name="maven.branch.typedefs" depends="clone-typedefs,check-maven-branch.typedefs" unless="typedefs.branch.exists">
<exec executable="${mvn}" dir="${typedefs}" failonerror="true" >
<arg value="release:branch" />
- <arg value="-DpushChanges=false" />
+ <!--<arg value="-DpushChanges=false" />-->
<arg value="-DbranchName=release/${release.version}" />
</exec>
</target>
@@ -458,7 +597,8 @@
<exec executable="${mvn}" dir="${typedefs}" failonerror="true" >
<arg value="--batch-mode" />
<arg value="release:prepare" />
- <arg value="-Dtag=org.apache.royale.typedefs-${release.version}-${rc}" />
+ <!--<arg value="-DpushChanges=false" />-->
+ <arg value="-Dtag=org.apache.royale.typedefs-${release.version}-rc${rc}" />
<arg value="-DautoVersionSubmodules=true" />
</exec>
</target>
@@ -467,26 +607,28 @@
<!-- http://maven.apache.org/maven-release/maven-release-plugin/examples/perform-release.html -->
<exec executable="${mvn}" dir="${typedefs}" failonerror="true" >
<arg value="release:perform" />
+ <!--<arg value="-DpushChanges=false" />-->
</exec>
</target>
- <target name="royale.typedefs" depends="clone-typedefs,update.typedefs.pom,maven.prepare.typedefs,maven.perform.typedefs" />
+ <target name="royale.typedefs" depends="clone-typedefs,checkout-release-branch-typedefs,update.typedefs.pom,maven.prepare.typedefs,maven.perform.typedefs" />
<target name="update.framework.pom" >
<replaceregexp file="${asjs}/pom.xml" byline="true" encoding="UTF-8">
- <regexp pattern="royale.compiler.version>*.<"/>
+ <regexp pattern="royale.compiler.version>.*<"/>
<substitution expression="royale.compiler.version>${release.version}<"/>
</replaceregexp>
<replaceregexp file="${asjs}/pom.xml" byline="true" encoding="UTF-8">
- <regexp pattern="royale.build-tools.version>*.<"/>
+ <regexp pattern="royale.build-tools.version>.*<"/>
<substitution expression="royale.build-tools.version>1.0.0<"/>
</replaceregexp>
+ <antcall target="git-commit-and-push-asjs" />
</target>
<target name="maven.branch.framework" depends="clone-asjs,check-maven-branch" unless="branch.exists">
<exec executable="${mvn}" dir="${asjs}" failonerror="true" >
<arg value="release:branch" />
- <arg value="-DpushChanges=false" />
+ <!--<arg value="-DpushChanges=false" />-->
<arg value="-DbranchName=release/${release.version}" />
</exec>
</target>
@@ -496,7 +638,8 @@
<exec executable="${mvn}" dir="${asjs}" failonerror="true" >
<arg value="--batch-mode" />
<arg value="release:prepare" />
- <arg value="-Dtag=org.apache.royale.framework-${release.version}-${rc}" />
+ <!--<arg value="-DpushChanges=false" />-->
+ <arg value="-Dtag=org.apache.royale.framework-${release.version}-rc${rc}" />
<arg value="-DautoVersionSubmodules=true" />
</exec>
</target>
@@ -505,10 +648,11 @@
<!-- http://maven.apache.org/maven-release/maven-release-plugin/examples/perform-release.html -->
<exec executable="${mvn}" dir="${asjs}" failonerror="true" >
<arg value="release:perform" />
+ <!--<arg value="-DpushChanges=false" />-->
</exec>
</target>
- <target name="royale.framework" depends="clone-asjs,update.framework.pom,maven.prepare,maven.perform" />
+ <target name="royale.framework" depends="clone-asjs,checkout-release-branch,update.framework.pom,maven.prepare,maven.perform" />
<target name="close.maven.staging.repo" >
<input
@@ -523,6 +667,10 @@
<target name="maven" depends="check-empty-folder, use_release_branch, royale.compiler, royale.typedefs, royale.framework, close.maven.staging.repo">
</target>
+ <target name="maven_only_compiler" depends="check-empty-folder, use_release_branch, royale.compiler">
+ </target>
+ <target name="maven_skip_compiler" depends="check-empty-folder, use_release_branch, royale.typedefs, royale.framework, close.maven.staging.repo">
+ </target>
<target name="make_branches" depends="check-empty-folder,use_develop_branch,maven.branch.compiler,maven.branch.typedefs, maven.branch.framework">
</target>
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.