Repository: flex-utilities Updated Branches: refs/heads/develop 9bd1ae7ef -> f584fd9a6
try ignoring build.number in the release candidate and approval scripts. The build number should be add to the release.version in these scripts (3.3.2, etc). The main build.xml will still use build.number so it still needs to be updated Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/f584fd9a Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/f584fd9a Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/f584fd9a Branch: refs/heads/develop Commit: f584fd9a6f13921e8e8f9a45f75a78a2fee08533 Parents: 9bd1ae7 Author: Alex Harui <[email protected]> Authored: Wed Jun 20 09:59:11 2018 -0700 Committer: Alex Harui <[email protected]> Committed: Wed Jun 20 10:00:21 2018 -0700 ---------------------------------------------------------------------- flex-installer/ApproveInstaller.xml | 2 +- flex-installer/build.number | 2 +- flex-installer/releasecandidate.xml | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f584fd9a/flex-installer/ApproveInstaller.xml ---------------------------------------------------------------------- diff --git a/flex-installer/ApproveInstaller.xml b/flex-installer/ApproveInstaller.xml index 8cfe58b..9f2cd33 100644 --- a/flex-installer/ApproveInstaller.xml +++ b/flex-installer/ApproveInstaller.xml @@ -106,7 +106,7 @@ </condition> <property name="package.url.path" value="https://dist.apache.org/repos/dist/dev/flex/installer/${release.version}/rc${rc}"; /> - <property name="package.url.name" value="apache-flex-sdk-installer-${release.version}.${build.number}-src" /> + <property name="package.url.name" value="apache-flex-sdk-installer-${release.version}-src" /> <condition property="zip.compressed"> <equals arg1="zip" arg2="${package.suffix}" /> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f584fd9a/flex-installer/build.number ---------------------------------------------------------------------- diff --git a/flex-installer/build.number b/flex-installer/build.number index 1a39de9..1dde23f 100644 --- a/flex-installer/build.number +++ b/flex-installer/build.number @@ -1,3 +1,3 @@ #Copyright 2014-2015 The Apache Software Foundation. #Thu, 18 Jun 2015 10:15:00 +1000 -build.number=1 +build.number=2 http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f584fd9a/flex-installer/releasecandidate.xml ---------------------------------------------------------------------- diff --git a/flex-installer/releasecandidate.xml b/flex-installer/releasecandidate.xml index 7c58a57..ee3cf0f 100644 --- a/flex-installer/releasecandidate.xml +++ b/flex-installer/releasecandidate.xml @@ -225,12 +225,12 @@ <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" > - <include name="apache-flex-sdk-installer-${release.version}.${build.number}-src*" /> + <include name="apache-flex-sdk-installer-${release.version}-src*" /> </fileset> </copy> <copy todir="${dist.dev}/flex/installer/${release.version}/rc${rc}/binaries" > <fileset dir="${basedir}/release" > - <include name="apache-flex-sdk-installer-${release.version}.${build.number}-bin*" /> + <include name="apache-flex-sdk-installer-${release.version}-bin*" /> </fileset> </copy> <copy file="${basedir}/README" tofile="${dist.dev}/flex/installer/${release.version}/rc${rc}/READme" /> @@ -298,28 +298,28 @@ <target name="other-platform" depends="other-platform-mac, other-platform-win" unless="skip.other.platform" > </target> <target name="other-platform-mac" if="isMac" > - <available file="${basedir}/release/apache-flex-sdk-installer-${release.version}.${build.number}-bin.exe" + <available file="${basedir}/release/apache-flex-sdk-installer-${release.version}-bin.exe" type="file" property="other.binary" /> - <fail message="${basedir}/release/apache-flex-sdk-installer-${release.version}.${build.number}-bin.exe not found. The windows version should be built before running this script" + <fail message="${basedir}/release/apache-flex-sdk-installer-${release.version}-bin.exe not found. The windows version should be built before running this script" unless="other.binary"/> <ant antfile="build.xml" target="sign_exe" /> <mkdir dir="${dist.dev}/flex/installer/${release.version}/rc${rc}/binaries" /> <copy todir="${dist.dev}/flex/installer/${release.version}/rc${rc}/binaries" > <fileset dir="${basedir}/release" > - <include name="apache-flex-sdk-installer-${release.version}.${build.number}-bin*" /> + <include name="apache-flex-sdk-installer-${release.version}-bin*" /> </fileset> </copy> </target> <target name="other-platform-win" if="isWindows" > - <available file="${basedir}/release/apache-flex-sdk-installer-${release.version}.${build.number}-bin.dmg" + <available file="${basedir}/release/apache-flex-sdk-installer-${release.version}-bin.dmg" type="file" property="other.binary" /> - <fail message="${basedir}/release/apache-flex-sdk-installer-${release.version}.${build.number}-bin.dmg not found. The windows version should be built before running this script" + <fail message="${basedir}/release/apache-flex-sdk-installer-${release.version}-bin.dmg not found. The windows version should be built before running this script" unless="other.binary"/> <ant antfile="build.xml" target="sign_dmg" /> <mkdir dir="${dist.dev}/flex/installer/${release.version}/rc${rc}/binaries" /> <copy todir="${dist.dev}/flex/installer/${release.version}/rc${rc}/binaries" > <fileset dir="${basedir}/release" > - <include name="apache-flex-sdk-installer-${release.version}.${build.number}-bin*" /> + <include name="apache-flex-sdk-installer-${release.version}-bin*" /> </fileset> </copy> </target> @@ -431,13 +431,13 @@ ${my.name} <mkdir dir="${dist.release}/flex/installer/${release.version}/binaries" /> <copy todir="${dist.release}/flex/installer/${release.version}/binaries" > <fileset dir="${dist.dev}/flex/installer/rc${rc}/binaries" > - <include name="apache-flex-sdk-installer-${release.version}.${build.number}-bin*" /> + <include name="apache-flex-sdk-installer-${release.version}-bin*" /> </fileset> </copy> <copy todir="${dist.release}/flex/installer/${release.version}" > <fileset dir="${dist.dev}/flex/installer/rc${rc}" > <include name="READme" /> - <include name="apache-flex-sdk-installer-${release.version}.${build.number}-src*" /> + <include name="apache-flex-sdk-installer-${release.version}-src*" /> </fileset> </copy> <exec executable="${svn}" dir="${dist.release}/flex/installer" failonerror="true" > @@ -456,9 +456,9 @@ ${my.name} <exec executable="${git}" dir="${basedir}" failonerror="true" > <arg value="tag" /> <arg value="-a" /> - <arg value="apache-flex-sdk-installer-${release.version}.${build.number}" /> + <arg value="apache-flex-sdk-installer-${release.version}" /> <arg value="-m" /> - <arg value=""Official release of apache-flex-sdk-installer-${release.version}.${build.number}"" /> + <arg value=""Official release of apache-flex-sdk-installer-${release.version}"" /> </exec> <exec executable="${git}" dir="${basedir}" failonerror="true" > <arg value="push" />
