Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.

Former-commit-id: 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]
Former-commit-id: 682c10767d

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>
-		<if>
+			<equals arg1="${installer}" arg2="false" />
-			<equals arg1="${git.working.dir}" arg2="" />
+			<then> 
-			<then>
+				<!-- Ensure the git working directory has been set. -->
-				<fail 
+				<if>
-					message="The git working directory has not been specified: use -Dgit.working.dir=" />
+					<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>
+		</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>		
 		
 		<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>
+</project>

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/*
+/awips2/edex/*