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

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

Browse source 
Former-commit-id: 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]
Former-commit-id: 682c10767d
This commit is contained in:
Bryan Kowal 2012-02-17 12:17:14 -06:00
parent 65b22abd24
commit 2ba23624b4
2 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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>
</project>

9
rpms/awips2.edex/Installer.edex-cots/component.spec
View file

@ -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/*