Fixed zstackio#367 zstackio#368 zstackio#369, add condition for zstac…

…k-network and zstack-distro
tolbkni · Mar 7, 2018 · 9d61045 · 9d61045
1 parent 3a19fa8
commit 9d61045
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/zstackbuild/build.xml b/zstackbuild/build.xml
@@ -193,6 +193,18 @@
         <echo message="successfully build zstack.war at ${war.file}" />
     </target>
 
+    <target name="build-zstack-network-on-condition" if="${build.zstack.network}">
+        <antcall target="build-zstack-network" />
+    </target>
+
+    <target name="assemble-zstack-network-on-condition" if="${build.zstack.network}">
+        <antcall target="assemble-zstack-network" />
+    </target>
+
+    <target name="check-zstack-distro-on-condition" if="${check.zstack.distro}">
+        <antcall target="check-zstack-distro" />
+    </target>
+
     <!-- For UI 1.x -->
     <target name="build-zstack-dashboard-on-condition" unless="${build.zstack.ui.war}">
         <antcall target="build-zstack-dashboard" />
@@ -214,6 +226,7 @@
     <target name="help">
         <echo message="usage: ant [build-war|package|all|build-vr] -Dzstack_build_root=YOUR_ZSTACK_PACKAGE_ROOT" />
         <echo message="[zstack_build_root] default path is /usr/local/zstack/root/, which is defined in build.properties. It should be the same parent folder for zstack-utility and zstack-woodpecker." />
+        <echo message="[zstack_build_root] path now is ${zstack_build_root}" />
     </target>
 
     <target name="do-build" depends="prepare, build-zstack-war" >
@@ -276,10 +289,10 @@
                 <antcall target="build-zstack-vyos"/>
             </sequential>
             <sequential>
-                <antcall target="build-zstack-network"/>
+                <antcall target="build-zstack-network-on-condition"/>
             </sequential>
             <sequential>
-                <antcall target="check-zstack-distro"/>
+                <antcall target="check-zstack-distro-on-condition"/>
             </sequential>
         </parallel>
     </target>
@@ -353,7 +366,7 @@
                 <antcall target="assemble-zstack-vyos"/>
             </sequential>
             <sequential>
-                <antcall target="assemble-zstack-network"/>
+                <antcall target="assemble-zstack-network-on-condition"/>
             </sequential>
         </parallel>