Issue #2754 - fix ant xpath error; gfe is now dependent on kml (unrelated to this change)

Former-commit-id: 0e89136215 [formerly 6e19ac4acf] [formerly 6fd129379f] [formerly 0e89136215 [formerly 6e19ac4acf] [formerly 6fd129379f] [formerly 678fb83ded [formerly 6fd129379f [formerly e027cf42b3b395a834f91512e269e41377f673ef]]]]
Former-commit-id: 678fb83ded
Former-commit-id: 6c7b44fc8a [formerly 9ef27edf5f] [formerly 2b74f17b03d7ffc9219150c073ed97847f0ecc59 [formerly 77370b4e68]]
Former-commit-id: 1e3af9b64d512f695c923395197aae37cccdf84f [formerly cf6c6feccc]
Former-commit-id: 3dda41af98
This commit is contained in:
Bryan Kowal 2014-01-30 18:11:48 -06:00
parent d469290095
commit c966d2b01d
4 changed files with 12 additions and 7 deletions

View file

@ -218,9 +218,13 @@
<taskdef resource="net/sf/antcontrib/antlib.xml"
classpath="${builder}/../lib/ant/ant-contrib-1.0b3.jar" />
<taskdef name="xmltask"
classpath="${builder}/../lib/ant/xmltask-v1.15.1.jar"
classname="com.oopsconsultancy.xmltask.ant.XmlTask" />
<taskdef name="xmltask"
classname="com.oopsconsultancy.xmltask.ant.XmlTask">
<classpath>
<pathelement path="${builder}/../lib/ant/xmltask-v1.15.1.jar"/>
<pathelement path="${builder}/../lib/ant/xalan-2.7.1.jar"/>
</classpath>
</taskdef>
<!-- Generate the 32-bit CAVE ini files -->
<var name="cave.arch" value="arch.x86" />

Binary file not shown.

View file

@ -219,6 +219,10 @@
<param name="feature"
value="com.raytheon.viz.grib.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.kml.export.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.gfe.feature" />
@ -282,10 +286,6 @@
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.useradmin.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.kml.export.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"

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.text.feature" version="1.0.0.qualifier"/>
<import feature="com.raytheon.uf.viz.kml.export.feature" version="1.0.0.qualifier"/>
</requires>
<plugin