From 8ba2d0a1d345cde86319cd720fd22e0cf500e928 Mon Sep 17 00:00:00 2001
From: Emil Ivov <emcho@jitsi.org>
Date: Wed, 7 Mar 2007 16:10:01 +0000
Subject: [PATCH] move deployment of os-specific bundles to a separate target
 so that we could make it dependant on the bundles.dest prop and not execute
 it if it's not set.

---
 build.xml | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/build.xml b/build.xml
index 58e3be69a..fdd8bd27a 100644
--- a/build.xml
+++ b/build.xml
@@ -646,17 +646,10 @@
 
     <!--RUN-TESTS-->
     <target name="test"
-        depends="prepare-single-test,prepare-all-tests,clean-test-reports"
+        depends="prepare-single-test,prepare-all-tests,clean-test-reports,
+                 -deploy-os-specific-bundles"
         description="Starts felix and runs selected Service Impl Compatibility Kits.">
 
-        <!-- before we run the tests, make sure we copy os-specific bundles
-             from sc-bundles/osname to its parent sc-bundles-->
-        <copy todir="${bundles.dest}">
-            <fileset dir="${bundles.dest.os}">
-                <include name="**/*.jar"/>
-            </fileset>
-        </copy>
-
         <!-- Do the testing itself. Note that we don't fail on error as we need
              to generate an html report before leaving this target.-->
         <java classname="org.apache.felix.main.Main"
@@ -730,18 +723,10 @@
       </junitreport>
     </target>
 
-    <!--RUN-SIP-COMMUNICATOR - n.b. has NO Dependents!! -->
-    <target name="run"
+    <!--RUN-SIP-COMMUNICATOR -->
+    <target name="run" depends="-deploy-os-specific-bundles"
         description="Starts felix and runs sip-comunicator gui (use latest build).">
 
-        <!-- before we run, make sure we copy os-specific bundles from
-             sc-bundles/osname to its parent sc-bundles-->
-        <copy todir="${bundles.dest}">
-            <fileset dir="${bundles.dest.os}">
-                <include name="**/*.jar"/>
-            </fileset>
-        </copy>
-
          <!-- forking prevents from debugging -->
         <java classname="org.apache.felix.main.Main"
             fork="true"
@@ -771,6 +756,17 @@
 
     </target>
 
+    <!-- we run this target before we run SC in order to copy os-specific
+             bundles from sc-bundles/osname to its parent sc-bundles-->
+    <target name="-deploy-os-specific-bundles" if="bundles.dest">
+
+        <copy todir="${bundles.dest}">
+            <fileset dir="${bundles.dest.os}">
+                <include name="**/*.jar"/>
+            </fileset>
+        </copy>
+    </target>
+
     <!--CRUISE CONTROL BUILD LOOP target-->
     <target name="cc-buildloop" depends="rebuild,test"
             description="Comprehensive (paranoid) rebuild and test (used by Cruise Control)."/>