You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2018/06/20 22:17:48 UTC
[1/2] git commit: [flex-utilities] [refs/heads/develop] - change the
way we handle building the 'other platform'. We will try just running the
releasecandidate script and skip tagging
Repository: flex-utilities
Updated Branches:
refs/heads/develop 2c968f2e6 -> 1ed01d7e0
change the way we handle building the 'other platform'. We will try just running the releasecandidate script and skip tagging
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/896115f9
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/896115f9
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/896115f9
Branch: refs/heads/develop
Commit: 896115f9d86043a0a69f3976d92827d018ece828
Parents: 2c968f2
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 20 15:16:04 2018 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 20 15:16:04 2018 -0700
----------------------------------------------------------------------
flex-installer/releasecandidate.xml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/896115f9/flex-installer/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/flex-installer/releasecandidate.xml b/flex-installer/releasecandidate.xml
index 02ea3cd..9e1c10d 100644
--- a/flex-installer/releasecandidate.xml
+++ b/flex-installer/releasecandidate.xml
@@ -215,12 +215,14 @@
<target name="main" depends="install-rat" description="Perform required release approval steps">
<antcall target="check-new-version" />
- <antcall target="other-platform" />
<exec executable="${git}" dir="${basedir}/.." failonerror="true" >
<arg value="pull" />
<arg value="--rebase" />
</exec>
<ant antfile="build.xml" target="release" />
+ <exec executable="${svn}" dir="${dist.dev}/flex/installer" failonerror="true" >
+ <arg value="up" />
+ </exec>
<mkdir dir="${dist.dev}/flex/installer/${release.version}/rc${rc}/binaries" />
<copy todir="${dist.dev}/flex/installer/${release.version}/rc${rc}" >
<fileset dir="${basedir}/release" >
@@ -243,6 +245,11 @@
<arg value="-m" />
<arg value="rc${rc} of Apache Flex Installer ${release.version}" />
</exec>
+ <antcall target="gittags" />
+ <antcall target="mail" />
+ </target>
+
+ <target name="gittags" unless="no.tag" >
<exec executable="${git}" dir="${basedir}/.." failonerror="true" >
<arg value="tag" />
<arg value="-a" />
@@ -254,7 +261,6 @@
<arg value="push" />
<arg value="--tags" />
</exec>
- <antcall target="mail" />
</target>
<target name="commit-and-mail" >
[2/2] git commit: [flex-utilities] [refs/heads/develop] - use 3-piece
version and skip using build.numer
Posted by ah...@apache.org.
use 3-piece version and skip using build.numer
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/1ed01d7e
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/1ed01d7e
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/1ed01d7e
Branch: refs/heads/develop
Commit: 1ed01d7e0f145c9db928fef40daeae45bc92ba5b
Parents: 896115f
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 20 15:17:39 2018 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 20 15:17:39 2018 -0700
----------------------------------------------------------------------
flex-installer/build.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1ed01d7e/flex-installer/build.properties
----------------------------------------------------------------------
diff --git a/flex-installer/build.properties b/flex-installer/build.properties
index 947d472..8c99600 100644
--- a/flex-installer/build.properties
+++ b/flex-installer/build.properties
@@ -19,7 +19,7 @@
-->
#nano version number is added by build script
-release.version=3.3
+release.version=3.3.2
# Flash player version for which player global swc to use
playerglobal.version = 11.1