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

VLab Issue #5395 - Build fixes and gfeConfig.py update

Browse source 
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: fd57e5334c [formerly b7369c5eef] [formerly cf72b5753d [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]
Former-commit-id: cf72b5753d
Former-commit-id: 330eae9f9e
This commit is contained in:
Shawn Hooper 2014-11-20 13:07:30 -05:00 • committed by Shawn.Hooper
parent 2b181f5204
commit 2f954d65be
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
View file

@ -395,7 +395,7 @@ TemporalEditorWEMode = "VISIBLE"
#ProductOutputDialog_bgColor = "#d0d0d0"
#ProductOutputDialog_wrapMode = 1 #default, if not listed in wrapPils, nonWrap
ProductOutputDialog_wrapPils = []
ProductOutputDialog_nonWrapPils = ['AFM','PFM','FWF','SFT','WCN','FWS']
ProductOutputDialog_nonWrapPils = ['AFM','PFM','FWF','SFT','WCN','FWS','TCV','HLS']
#ProductOutputDialog_wrapSize = 66
#ProductOutputDialog_lockColor = "blue"
#ProductOutputDialog_frameColor = "red"

1
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
View file

@ -27,6 +27,7 @@ Require-Bundle: com.raytheon.uf.common.localization;bundle-version="1.11.1",
com.google.guava;bundle-version="1.0.0",
com.raytheon.uf.edex.auth;bundle-version="1.12.1174",
com.raytheon.uf.common.serialization.comm,
com.raytheon.uf.edex.python.decoder;bundle-version="1.12.1174",
org.apache.commons.io;bundle-version="2.4.0"
Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Export-Package: com.raytheon.uf.edex.activetable

15
edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
View file

@ -53,6 +53,7 @@
<property name="gfe.suite.home" value="${install.dir}" />
<property name="gfe.suite.bin" value="${install.dir}/bin" />
<property name="gfe.suite.hti" value="${install.dir}/hti" />
<!-- Create the copy filter -->
<!-- filter set -->
@ -66,7 +67,9 @@
<echo message="Updating ${gfe.suite.bin} with latest GFESuite tools" />
<echo message="deploy.client=${deploy.client}" />
<mkdir dir="${gfe.suite.bin}"/>
<mkdir dir="${gfe.suite.hti}"/>
<antcall target="-deploy.cli.common"/>
<antcall target="-deploy.hti"/>
<antcall target="-deploy.svcBackup"/>
<!-- <antcall target="-deploy.cli.client"/> -->
<antcall target="-set.permissions"/>
@ -88,6 +91,16 @@
</copy>
</target>
<target name="-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>
<target name="-deploy.svcBackup" if="deploy.svcBackup"
description="Deploys service backup scripts to a specific directory">
<echo message="Copying in service backup scripts" />
@ -114,4 +127,4 @@
</fileset>
</chmod>
</target>
</project>
</project>

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

@ -81,6 +81,7 @@ if [ $? -ne 0 ]; then
exit 1
fi
# Copy the profile.d scripts.
PROFILE_D_DIR="rpms/common/environment/awips2-gfesuite/profile.d"
cp %{_baseline_workspace}/${PROFILE_D_DIR}/* ${RPM_BUILD_ROOT}/etc/profile.d