don't add folder if folder already exists (assume its been added). Th…

…is assumes the build will not fail so test the build separately or delete the folder before re-trying
apache · Jun 20, 2018 · 7bbf0d5 · 7bbf0d5
1 parent 1ed01d7
commit 7bbf0d5
Showing 1 changed file with 30 additions and 6 deletions.
diff --git 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" />