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

Merge tag 'OB_14.3.2-24m' into master_14.4.1

Browse source 
14.3.2-24m

Conflicts:
	rpms/awips2.core/Installer.gfesuite-server/component.spec

Former-commit-id: f3dcf799d6 [formerly cc7a2e7082 [formerly cf8cd9d051] [formerly f3dcf799d6 [formerly a91ad7ff32c153c34d6982f29cc497812d9f22f7]]]
Former-commit-id: cc7a2e7082 [formerly cf8cd9d051]
Former-commit-id: cc7a2e7082
Former-commit-id: 6f334984cb
This commit is contained in:
Fay.Liang 2015-03-27 15:07:28 -04:00
commit bf3bcb5de0
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
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}"/>
@ -94,13 +98,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>

3
rpms/awips2.core/Installer.gfesuite-server/component.spec
View file

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