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.

cusax-fix
Emil Ivov 19 years ago
parent 53d8fd140d
commit 8ba2d0a1d3

@ -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)."/>

Loading…
Cancel
Save