Merge "Issue #2499: Fix build" into omaha_13.5.3

Former-commit-id: 27aa0dd6ba [formerly 27aa0dd6ba [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]
Former-commit-id: 6ccb444219
Former-commit-id: f4bdb0caea
This commit is contained in:
Richard Peter 2013-11-06 13:44:11 -06:00 committed by Gerrit Code Review
commit b52c9482ea
3 changed files with 9 additions and 22 deletions

View file

@ -22,6 +22,7 @@
<import feature="com.raytheon.uf.viz.common.core.feature" version="1.0.0.qualifier"/>
<import feature="com.raytheon.uf.viz.core.feature" version="1.0.0.qualifier"/>
<import feature="com.raytheon.viz.radar.feature" version="1.0.0.qualifier"/>
<import feature="com.raytheon.uf.edex.archive.feature" version="1.0.0.qualifier"/>
</requires>
<plugin
@ -38,20 +39,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.edex.maintenance"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.edex.plugin.text"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.viz.texteditor"
download-size="0"

View file

@ -50,6 +50,10 @@
<param name="feature"
value="com.raytheon.uf.edex.grib.feature" />
</antcall>
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.archive.feature" />
</antcall>
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.text.feature" />
@ -102,10 +106,6 @@
<param name="feature"
value="com.raytheon.uf.edex.datadelivery.feature" />
</antcall>
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.archive.feature" />
</antcall>
<!-- SPECIAL CASE -->
<if>

View file

@ -68,6 +68,10 @@
id="com.raytheon.uf.edex.grib.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.edex.archive.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.edex.text.feature"
version="0.0.0"/>
@ -124,8 +128,4 @@
id="com.raytheon.uf.edex.registry.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.edex.archive.feature"
version="0.0.0"/>
</feature>