From ce9165ce58f4deadd6a26c863802128ecf64d08c Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Fri, 17 Feb 2012 12:17:14 -0600
Subject: [PATCH] Issue #202 - fix deploy-install and the edex-cots rpm
 specification in test_sync.

Former-commit-id: 5754f9dfd861d89973c8efeddf70614df3e18d48 [formerly 10a0ca252dd747298e2ffeb7d2de248db8658686] [formerly 5754f9dfd861d89973c8efeddf70614df3e18d48 [formerly 10a0ca252dd747298e2ffeb7d2de248db8658686] [formerly 682c10767d4087fbef1d66bd9bc4ae479840d121 [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]]
Former-commit-id: 682c10767d4087fbef1d66bd9bc4ae479840d121
Former-commit-id: cc8c6597a22157d3d71cf595a91eb6a02f7e346d [formerly 2ba23624b49c077dcaa8f3b2848784c7182fa0ef]
Former-commit-id: 8403801a2b6717a4a7e9bc391362aefc3a269186
---
 edexOsgi/build.edex/deploy-install.xml        | 43 +++++++++++--------
 .../Installer.edex-cots/component.spec        |  9 ++--
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/edexOsgi/build.edex/deploy-install.xml b/edexOsgi/build.edex/deploy-install.xml
index 27a3bcb21b..16aa97ca5e 100644
--- a/edexOsgi/build.edex/deploy-install.xml
+++ b/edexOsgi/build.edex/deploy-install.xml
@@ -43,25 +43,30 @@
 		<echo message="BUILD TIME   = ${build.time}" />
 		<echo message="BUILD SYSTEM = ${build.system}" />
 
-		<!-- Ensure the git working directory has been set. -->
-		<if>
-			<equals arg1="${git.working.dir}" arg2="" />
-			<then>
-				<fail 
-					message="The git working directory has not been specified: use -Dgit.working.dir=" />
+                <if>
+			<equals arg1="${installer}" arg2="false" />
+			<then> 
+				<!-- Ensure the git working directory has been set. -->
+				<if>
+					<equals arg1="${git.working.dir}" arg2="" />
+					<then>
+						<fail 
+							message="The git working directory has not been specified: use -Dgit.working.dir=" />
+					</then>
+				</if>
+				<!-- Ensure that the specified git working directory exists. -->
+				<if>
+					<available file="${git.working.dir}" 
+						type="dir" />
+					<then>
+						<!-- Continue -->
+					</then>
+				<else>
+					<fail message="The specified git working directory does not exist." />
+				</else>
+				</if>
 			</then>
-		</if>
-		<!-- Ensure that the specified git working directory exists. -->
-		<if>
-			<available file="${git.working.dir}" 
-				type="dir" />
-			<then>
-				<!-- Continue -->
-			</then>
-			<else>
-				<fail message="The specified git working directory does not exist." />
-			</else>
-		</if>		
+		</if>	
 		
 		<var name="projects.dirs" 
 			value="${git.working.dir}/cots;${git.working.dir}/edexOsgi;${git.working.dir}/ncep;${git.working.dir}/RadarServer" />
@@ -788,4 +793,4 @@
 
 	&substitute-targets;
 	
-</project>
\ No newline at end of file
+</project>
diff --git a/rpms/awips2.edex/Installer.edex-cots/component.spec b/rpms/awips2.edex/Installer.edex-cots/component.spec
index 9b429edb37..e64619ccab 100644
--- a/rpms/awips2.edex/Installer.edex-cots/component.spec
+++ b/rpms/awips2.edex/Installer.edex-cots/component.spec
@@ -55,7 +55,7 @@ copyApplicableDeltas ${RPM_BUILD_ROOT} %{_component_name} \
 #---------------------------------------------------------------------------#
 
 %install
-DEPLOY_SCRIPT="build.edex/deploy-install.xml"
+DEPLOY_SCRIPT="deploy-install.xml"
 
 # Deploy Edex To Our Temporary Build Directory.
 
@@ -71,10 +71,13 @@ fi
 ANT_EXE=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-ant`
 ANT_EXE="${ANT_EXE}/bin/ant"
 
-${ANT_EXE} -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \
+pushd . > /dev/null
+cd ${WORKSPACE_DIR}/build.edex
+${ANT_EXE} -file ${DEPLOY_SCRIPT} \
    -Dinstall.dir=${RPM_BUILD_ROOT}/awips2/edex \
    -Dinstaller=true -Dlocal.build=false \
    -Dcomponent.to.deploy=edex-cots
+popd > /dev/null
 
 %pre
 if [ "${1}" = "1" ]; then
@@ -155,4 +158,4 @@ rm -rf ${RPM_BUILD_ROOT}
 #---------------------------------------------------------------------------#
 %dir /awips2
 %dir /awips2/edex
-/awips2/edex/*
\ No newline at end of file
+/awips2/edex/*