xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Former-commit-id: e027cf42b3b395a834f91512e269e41377f673ef
This commit is contained in:
Bryan Kowal 2014-01-30 18:11:48 -06:00
parent d88019d902
commit 6fd129379f
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/build/cave/customTargets.xml
View file

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

BIN
cave/build/lib/ant/xalan-2.7.1.jar Normal file
View file

Binary file not shown.

8
cave/build/p2-build.xml
View file

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

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