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

Merge branch 'unidata_15.1.1' of github.com:Unidata/awips2 into unidata_15.1.1

Browse source
This commit is contained in:
mjames-upc 2016-02-22 15:27:44 -06:00
commit 320f786824
4 changed files with 19 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml
View file

@ -18,84 +18,47 @@
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!--
Jan 7, 2015 mjames@ucar Reorganization for model directories allowing users
to easily add a model to the menu in localization perspective.
Initial models (not all will populate)
Regional and global
CMC
DGEX
GFS global
GFS-40km
HRRR
NAM-4km
NAM-12km
NAM-20km
NAM40
NAM-80km
NamDNG
NAVGEM
RAP-13km
RAP-40km
RTMA
URMA (URMA25)
UKMET
Hydro models
HPC (HPCqpfNDFD)
HPCGuide
HPCqpf
Ocean models
estofsUS
ETSS
FNMOC-WW3
-->
<menuContributionFile>
<include installTo="menu:models"
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="CMC" />
<substitute key="menuName" value="CMC" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="41 />
<substitute key="TP" value="TP"/>
</include>
<include installTo="menu:models"
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="DGEX" />
<substitute key="menuName" value="DGEX" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="41" />
<substitute key="TP" value="TP"/>
</include>
<include installTo="menu:models"
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="ECMF-Global" />
<substitute key="menuName" value="ECMWF Global" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="41" />
<substitute key="TP" value="TP6hr"/>
</include>
<include installTo="menu:models"
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="GFS" />
<substitute key="menuName" value="GFS global" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="41" />
<substitute key="TP" value="TP"/>
</include>
<include installTo="menu:models"
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="GFS40" />
<substitute key="menuName" value="GFS-40km" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="41" />
<substitute key="TP" value="TP"/>
</include>
<include installTo="menu:models"
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="HRRR" />
<substitute key="menuName" value="HRRR" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="17" />
<substitute key="TP" value="TP"/>
</include>
<include installTo="menu:models"
@ -109,21 +72,21 @@
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="NAM12" />
<substitute key="menuName" value="NAM-12km" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="29" />
<substitute key="TP" value="TP3hr"/>
</include>
<include installTo="menu:models"
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="NAM20" />
<substitute key="menuName" value="NAM-20km" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="29" />
<substitute key="TP" value="TP3hr"/>
</include>
<include installTo="menu:models"
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="NAM40" />
<substitute key="menuName" value="NAM-40km" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="29" />
<substitute key="TP" value="TP3hr"/>
</include>
<include installTo="menu:models"
@ -145,21 +108,21 @@
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="RAP13" />
<substitute key="menuName" value="RAP-13km" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="17" />
<substitute key="TP" value="TP"/>
</include>
<include installTo="menu:models"
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="RAP40" />
<substitute key="menuName" value="RAP-40km" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="17" />
<substitute key="TP" value="TP"/>
</include>
<include installTo="menu:models"
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="UKMET-NorthernHemisphere" />
<substitute key="menuName" value="UKMET Northern Hemisphere" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="15" />
<substitute key="TP" value="TP6hr"/>
</include>
@ -204,14 +167,14 @@
fileName="menus/volume/oceanFamilies.xml">
<substitute key="modelName" value="estofsUS" />
<substitute key="menuName" value="ESTOFS" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="12" />
<substitute key="TP" value="TP"/>
</include>
<include installTo="menu:models"
fileName="menus/volume/oceanFamilies.xml">
<substitute key="modelName" value="ETSS" />
<substitute key="menuName" value="ETSS Storm Surge" />
<substitute key="frameCount" value="1" />
<substitute key="frameCount" value="12" />
<substitute key="TP" value="TP"/>
</include>
<include installTo="menu:models"
@ -221,7 +184,7 @@
<include installTo="menu:models"
fileName="menus/volume/allFamilies.xml">
<substitute key="modelName" value="FNMOC-WW3" />
<substitute key="frameCount" value="5" />
<substitute key="frameCount" value="12" />
<substitute key="TP" value="TP"/>
</include>
-->

2
rpms/awips2.upc/Installer.ldm/component.spec
View file

@ -8,7 +8,7 @@
%define __prelink_undo_cmd %{nil}
Name: awips2-ldm
Summary: AWIPS II LDM Distribution
Version: %{_component_version}
Version: %{_component_version}.%{_component_release}
Release: %{_ldm_version}
Group: AWIPSII
BuildRoot: /tmp

4
rpms/unidata/build.sh
View file

@ -109,10 +109,10 @@ export rpm_end_dir="${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
#mkdir -p /awips2/jenkins/build/rpms/${rpm_end_dir}
if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/x86_64/)" ]; then
mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* /awips2/jenkins/build/rpms/awips2_15.1.1/x86_64/
mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/
fi
if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/noarch/)" ]; then
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* /awips2/jenkins/build/rpms/awips2_15.1.1/noarch/
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/noarch/
fi
END_TIME=`date "+%s"`

2
rpms/unidata/buildEnvironment.sh
View file

@ -13,7 +13,7 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace
# baseline is...
export BASELINE="${JENKINS_WORKSPACE}"
export AWIPSII_VERSION="15.1.2"
export AWIPSII_RELEASE="18"
export AWIPSII_RELEASE="5"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"