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

Omaha #3299 - Add back correct jars, update deploy-install to search for plugins in optionaldirectories

Browse source 
Change-Id: I5aebad06117f7072d322b8d7cbfe4a14acc2fdf8

Former-commit-id: 9d95e79cd7 [formerly 7539d84bba [formerly 3a09dc91fbeb7db16a99116ad2582932e3fd6e58]]
Former-commit-id: 7539d84bba
Former-commit-id: 465da92660
This commit is contained in:
Greg Armendariz 2015-02-26 13:58:38 -06:00
parent bea946605f
commit 82842a4717
5 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
cave/build/lib/ant/FeatureExplorer.jar
View file

Binary file not shown.

BIN
cave/build/lib/ant/IncludesGen.jar
View file

Binary file not shown.

17
edexOsgi/build.edex/deploy-install.xml
View file

@ -139,12 +139,23 @@
<var name="destination.directory" value="${edex.root.directory}/lib/plugins" />
<mkdir dir="${destination.directory}" />
<processPlugins includes.file="${includes.directory}/plugins.includes" plugin.type="plugins" plugin.directories="${basedirectories}" destination.directory="${destination.directory}" />
<processPlugins includes.file="${includes.directory}/core.includes" plugin.type="core" plugin.directories="${basedirectories}" destination.directory="${destination.directory}" />
<if>
<isset property="optionaldirectories" />
<then>
<var name="allDir" value="${basedirectories};${optionaldirectories}" />
<processPlugins includes.file="${includes.directory}/plugins.includes" plugin.type="plugins" plugin.directories="${allDir}" destination.directory="${destination.directory}" />
<processPlugins includes.file="${includes.directory}/core.includes" plugin.type="core" plugin.directories="${allDir}" destination.directory="${destination.directory}" />
</then>
<else>
<processPlugins includes.file="${includes.directory}/plugins.includes" plugin.type="plugins" plugin.directories="${basedirectories}" destination.directory="${destination.directory}" />
<processPlugins includes.file="${includes.directory}/core.includes" plugin.type="core" plugin.directories="${basedirectories}" destination.directory="${destination.directory}" />
</else>
</if>
<var name="destination.directory" value="${edex.root.directory}/lib/dependencies" />
<mkdir dir="${destination.directory}" />
<if>
<isset property="optionaldirectories" />
<then>

BIN
edexOsgi/build.edex/lib/ant/FeatureExplorer.jar
View file

Binary file not shown.

BIN
edexOsgi/build.edex/lib/ant/IncludesGen.jar
View file

Binary file not shown.