Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development

Former-commit-id: c06f0ed7f4 [formerly 9bc6dd47b6] [formerly c618169639] [formerly 3991df64ff [formerly c618169639 [formerly 88779a4fbd8078d81139b7555525142940999558]]]
Former-commit-id: 3991df64ff
Former-commit-id: 700e4d9bcbd8afebd66b90ead899faa9b5f42bfb [formerly d900459ab4]
Former-commit-id: 3896cf42f1
This commit is contained in:
Dustin Johnson 2013-03-28 13:07:20 -05:00 committed by Gerrit Code Review
commit d37764f722

View file

@ -17,7 +17,7 @@
<property name="eclipse.launcher.jar" <property name="eclipse.launcher.jar"
value="org.eclipse.equinox.launcher_1.1.0.v20100507.jar" /> value="org.eclipse.equinox.launcher_1.1.0.v20100507.jar" />
<target name="main" depends="clean"> <target name="main-build" depends="clean">
<antcall target="build"> <antcall target="build">
<param name="feature" <param name="feature"
value="com.raytheon.uf.common.base.feature" /> value="com.raytheon.uf.common.base.feature" />
@ -113,10 +113,36 @@
</antcall> </antcall>
</then> </then>
</if> </if>
<antcall target="clean" />
</target> </target>
<!--
In the work assignment's edexOsgi/build.edex directory, create a file named similar to the following:
edexOsgi/build.edex/5-Data_Delivery-wa-build.properties
In the file, there should be one line such as:
wa.features=feature1,feature2
-->
<target name="wa-build" depends="main-build" description="Builds work assignment specific features after the main build">
<for param="wa.feature.list.file">
<fileset dir="${basedir}" includes="*-wa-build.properties" />
<sequential>
<var name="wa.features" unset="true" />
<property file="@{wa.feature.list.file}" />
<for list="${wa.features}" param="wa.feature">
<sequential>
<antcall target="build">
<param name="feature" value="@{wa.feature}" />
</antcall>
</sequential>
</for>
</sequential>
</for>
<antcall target="clean" />
</target>
<target name="main" depends="clean, main-build, wa-build" />
<target name="build"> <target name="build">
<!-- Execute the eclipse pde build script. --> <!-- Execute the eclipse pde build script. -->
<echo message="feature=${feature}" /> <echo message="feature=${feature}" />