Repository: flex-utilities Updated Branches: refs/heads/develop 1ed01d7e0 -> 092b4083e
don't add folder if folder already exists (assume its been added). This assumes the build will not fail so test the build separately or delete the folder before re-trying Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/7bbf0d51 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/7bbf0d51 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/7bbf0d51 Branch: refs/heads/develop Commit: 7bbf0d5127a8db7644a755bb5cf19e6cc6de991a Parents: 1ed01d7 Author: Alex Harui <aha...@apache.org> Authored: Wed Jun 20 15:32:11 2018 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Wed Jun 20 15:32:11 2018 -0700 ---------------------------------------------------------------------- flex-installer/releasecandidate.xml | 36 ++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/7bbf0d51/flex-installer/releasecandidate.xml ---------------------------------------------------------------------- diff --git a/flex-installer/releasecandidate.xml b/flex-installer/releasecandidate.xml index 9e1c10d..cb674f1 100644 --- a/flex-installer/releasecandidate.xml +++ b/flex-installer/releasecandidate.xml @@ -223,6 +223,9 @@ <exec executable="${svn}" dir="${dist.dev}/flex/installer" failonerror="true" > <arg value="up" /> </exec> + <available file="${dist.dev}/flex/installer/${release.version}/rc${rc}/binaries" + type="dir" + property="svn.dir.found"/> <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" > @@ -236,10 +239,7 @@ </copy> <copy file="${basedir}/README" tofile="${dist.dev}/flex/installer/${release.version}/rc${rc}/READme" /> <copy file="${basedir}/ApproveInstaller.xml" tofile="${dist.dev}/flex/installer/${release.version}/rc${rc}/ApproveInstaller.xml" /> - <exec executable="${svn}" dir="${dist.dev}/flex/installer" failonerror="true" > - <arg value="add" /> - <arg value="${dist.dev}/flex/installer/${release.version}/rc${rc}" /> - </exec> + <antcall target="svnadd" /> <exec executable="${svn}" dir="${dist.dev}/flex/installer" failonerror="true" > <arg value="commit" /> <arg value="-m" /> @@ -248,8 +248,32 @@ <antcall target="gittags" /> <antcall target="mail" /> </target> - - <target name="gittags" unless="no.tag" > + + <target name="svnaddfolder" unless="svn.dir.found"> + <exec executable="${svn}" dir="${dist.dev}/flex/installer" failonerror="true" > + <arg value="add" /> + <arg value="${dist.dev}/flex/installer/${release.version}/rc${rc}" /> + </exec> + </target> + <target name="svnadddmg" if="svn.dir.found"> + <exec executable="${svn}" dir="${dist.dev}/flex/installer" failonerror="false" > + <arg value="add" /> + <arg value="${dist.dev}/flex/installer/${release.version}/rc${rc}/binaries/*.dmg*" /> + </exec> + </target> + <target name="svnaddexe" if="svn.dir.found"> + <exec executable="${svn}" dir="${dist.dev}/flex/installer" failonerror="false" > + <arg value="add" /> + <arg value="${dist.dev}/flex/installer/${release.version}/rc${rc}/binaries/*.exe*" /> + </exec> + </target> + <target name="svnadd"> + <antcall target="svnaddfolder" /> + <antcall target="svnadddmg" /> + <antcall target="svnaddexe" /> + </target> + + <target name="gittags"> <exec executable="${git}" dir="${basedir}/.." failonerror="true" > <arg value="tag" /> <arg value="-a" />
