From 040368ea54437abc79998066c83c1571fa84acea Mon Sep 17 00:00:00 2001
From: David Gillingham <David.Gillingham@raytheon.com>
Date: Tue, 15 Jul 2014 16:00:46 -0500
Subject: [PATCH] Omaha #3389: Add ability for deploy-install.xml to run
 WA-specific deploy script for standalone components.

Change-Id: I39fe60ae80c8a62b9ed6052e353e314783bba999

Former-commit-id: afc28adc7ae8f39af3f9543d1fda8f0858be4e76 [formerly f9ca189dfc372a44208c4e510a61ccaa1f4a0e53 [formerly fc715e98a54a053ee0318cfb2b583e40ebe185af] [formerly afc28adc7ae8f39af3f9543d1fda8f0858be4e76 [formerly 334cfcf418b0659b496088d7ac2b2f111cf8bc72]]]
Former-commit-id: f9ca189dfc372a44208c4e510a61ccaa1f4a0e53 [formerly fc715e98a54a053ee0318cfb2b583e40ebe185af]
Former-commit-id: f9ca189dfc372a44208c4e510a61ccaa1f4a0e53
Former-commit-id: 96f97f6b5410bd3559631efc1241fb7cbce67513
---
 edexOsgi/build.edex/deploy-install.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/edexOsgi/build.edex/deploy-install.xml b/edexOsgi/build.edex/deploy-install.xml
index 0901aa6b92..6e7afd2386 100644
--- a/edexOsgi/build.edex/deploy-install.xml
+++ b/edexOsgi/build.edex/deploy-install.xml
@@ -94,13 +94,15 @@
 				<for list="${wa.to.deploy}" param="wa"
 				delimiter="${path.separator}">
 					<sequential>
+						<basename property="wa.name" file="@{wa}" />
 						<if>
-							<available file="@{wa}/edexOsgi/build.edex/wa-build.xml"
+							<available file="@{wa}/edex/deploy-${wa.name}/wa-deploy.xml"
 								type="file" />
 							<then>
 		        				<ant 
-		        					antfile="@{wa}/edexOsgi/build.edex/wa-build.xml" 
-		        					inheritall="true" inheritrefs="true"/>
+		        					antfile="@{wa}/edex/deploy-${wa.name}/wa-deploy.xml" 
+		        					inheritall="true" inheritrefs="true"
+							        useNativeBasedir="true" />
 							</then>
 						</if>
 					</sequential>