Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2

Former-commit-id: 8bdfffa97d [formerly 0b3baf855f [formerly 29863ea663] [formerly 8bdfffa97d [formerly f7d4e763a667aef949d360d18143f8caa618ae6b]]]
Former-commit-id: 0b3baf855f [formerly 29863ea663]
Former-commit-id: 0b3baf855f
Former-commit-id: 3593db8387
This commit is contained in:
Fay.Liang 2015-03-12 22:23:33 -04:00
commit d19df0f294
2 changed files with 8 additions and 2 deletions

View file

@ -44,6 +44,10 @@
<istrue value="${client.build}"/>
</condition>
<condition property="deploy.hti" value="yes">
<isfalse value="${client.build}"/>
</condition>
<condition property="deploy.svcBackup" value="yes">
<and>
<isfalse value="${client.build}"/>
@ -91,13 +95,12 @@
</copy>
</target>
<target name="-deploy.hti"
<target name="-deploy.hti" if="deploy.hti"
description="Deploys HTI software to a specific directory">
<!-- copy the CLI tools to the deploy directory -->
<echo message="Copying in HTI files" />
<copy todir="${gfe.suite.hti}" overwrite="true">
<fileset dir="${basedir}/hti"/>
<filterset refid="installer.filter.set"/>
</copy>
</target>

View file

@ -96,6 +96,9 @@ rm -rf ${RPM_BUILD_ROOT}
%dir /awips2
%dir /awips2/GFESuite
/awips2/GFESuite/*
%defattr(775,awips,fxalpha,775)
%dir /awips2/GFESuite/hti
/awips2/GFESuite/hti/*
%defattr(755,awips,fxalpha,755)
%dir /awips2/GFESuite/bin
/awips2/GFESuite/bin/*