Refactor build process for parallel lc-cmp symlink

NordicFlyer · Dec 10, 2018 · 2dea2f5 · 2dea2f5
1 parent a8bae7e
commit 2dea2f5
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 21 deletions.
diff --git a/lightcrafts/build.xml b/lightcrafts/build.xml
@@ -73,7 +73,9 @@
 
   <target name="javac" depends="resolve">
     <exec executable="${MAKE}" dir="products" failonerror="true"
-          vmlauncher="true"/>
+          vmlauncher="true">
+      <arg value="-j"/>
+    </exec>
 
     <mkdir dir="extbuild"/>
     <javac srcdir="extsrc" destdir="extbuild" includeantruntime="false"
@@ -228,9 +230,11 @@
   <!--===== Clean up =======================================================-->
 
   <target name="clean-up">
-    <delete dir="build"/>
-    <delete dir="javah"/>
-    <delete dir="extbuild"/>
+    <parallel>
+      <delete dir="build"/>
+      <delete dir="javah"/>
+      <delete dir="extbuild"/>
+    </parallel>
     <exec executable="${MAKE}" dir="jnisrc">
       <arg value="-j"/>
       <arg value="${clean-method}"/>

diff --git a/linux/build.xml b/linux/build.xml
@@ -42,7 +42,9 @@
   <target name="common">
     <ant dir="${common-dir}" target="jar"/>
     <exec executable="${MAKE}" dir="products" failonerror="true"
-          vmlauncher="true"/>
+          vmlauncher="true">
+      <arg value="-j"/>
+    </exec>
   </target>
 
   <target name="javac" depends="common">
@@ -188,11 +190,13 @@
   <target name="distclean">
     <ant dir="${common-dir}" target="distclean"/>
     <ant dir="help" target="clean"/>
-    <delete dir="archive"/>
-    <delete dir="build"/>
-    <delete dir="javah"/>
-    <delete dir="webstart"/>
-    <delete file="LightZone.tar.gz"/>
+    <parallel>
+      <delete dir="archive"/>
+      <delete dir="build"/>
+      <delete dir="javah"/>
+      <delete dir="webstart"/>
+      <delete file="LightZone.tar.gz"/>
+    </parallel>
     <exec executable="${MAKE}" dir="products">
       <arg value="distclean"/>
     </exec>

diff --git a/linux/help/build.xml b/linux/help/build.xml
@@ -58,8 +58,10 @@
     </target>
 
     <target name="clean">
-        <delete file="lightzonehelp.jar"/>
-        <delete dir="build"/>
+        <parallel>
+            <delete file="lightzonehelp.jar"/>
+            <delete dir="build"/>
+        </parallel>
     </target>
 
 </project>
diff --git a/macosx/build.xml b/macosx/build.xml
@@ -30,7 +30,9 @@
   <target name="common">
     <ant dir="${common-dir}" target="jar"/>
     <exec executable="make" dir="products" failonerror="true"
-          vmlauncher="false"/>
+          vmlauncher="false">
+      <arg value="-j"/>
+    </exec>
   </target>
 
   <target name="javac" depends="common">
@@ -204,9 +206,11 @@
 
   <target name="clean-up">
     <ant dir="${common-dir}" target="${clean-method}"/>
-    <delete dir="build"/>
-    <delete dir="javah"/>
-    <delete dir="${app-dir}"/>
+    <parallel>
+      <delete dir="build"/>
+      <delete dir="javah"/>
+      <delete dir="${app-dir}"/>
+    </parallel>
     <exec executable="make" dir="dmg">
       <arg value="-j"/>
       <arg value="${clean-method}"/>

diff --git a/windows/build.xml b/windows/build.xml
@@ -49,7 +49,9 @@
   <target name="common">
     <ant dir="${common-dir}" target="jar"/>
     <exec executable="make" dir="products" failonerror="true"
-          vmlauncher="false"/>
+          vmlauncher="false">
+      <arg value="-j"/>
+    </exec>
   </target>
 
   <target name="javac" depends="common">
@@ -213,9 +215,12 @@
 
   <target name="clean-up">
     <ant dir="${common-dir}" target="${clean-method}"/>
-    <delete dir="build"/>
-    <delete dir="javah"/>
-    <delete file="${installer-name}"/>
+    <parallel>
+      <delete dir="build"/>
+      <delete dir="javah"/>
+      <delete file="${installer-name}"/>
+      <delete file="products/lightzone.jvmargs"/>
+    </parallel>
     <exec executable="make" dir="helpers">
       <arg value="${clean-method}"/>
     </exec>
@@ -226,7 +231,6 @@
       <arg value="-j"/>
       <arg value="${clean-method}"/>
     </exec>
-    <delete file="products/lightzone.jvmargs"/>
     <antcall target="cc-clean"/>
   </target>