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

build updates for 14.4.1-10n11

Browse source 
Former-commit-id: a5814eb787
This commit is contained in:
mjames-upc 2015-11-09 14:21:35 -07:00
parent 63c64db8fd
commit 97483f127d
7 changed files with 16 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/build/p2-build.xml
View file

@ -277,18 +277,22 @@
<param name="feature"
value="com.raytheon.uf.viz.d2d.nsharp.feature" />
</antcall>
<!--
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.archive.feature" />
</antcall>
-->
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.ncep.perspective.feature" />
</antcall>
<!--
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.nwsauth.feature" />
</antcall>
-->
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.thinclient.feature" />

6
edexOsgi/build.edex/build.xml
View file

@ -50,10 +50,12 @@
<param name="feature"
value="com.raytheon.uf.edex.grib.feature" />
</antcall>
<!--
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.archive.feature" />
</antcall>
-->
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.text.feature" />
@ -66,10 +68,10 @@
<param name="feature"
value="com.raytheon.uf.edex.gfe.feature" />
</antcall>
<!-- <antcall target="build">
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.hydro.feature" />
</antcall> -->
</antcall>
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.radar.feature" />

1
rpms/awips2.cave/Installer.cave/component.spec
View file

@ -37,6 +37,7 @@ requires: openmotif
requires: libMrm.so.4
requires: libXp.so.6
requires: libg2c.so.0
requires: libstdc++
%description
%{_component_desc}

2
rpms/awips2.core/deploy.builder/build.sh
View file

@ -181,7 +181,7 @@ buildRPM "Installer.aviation"
buildRPM "Installer.cli"
buildRPM "Installer.database"
buildRPM "Installer.maps-database"
buildRPM "Installer.gfe.climo"
#buildRPM "Installer.gfe.climo"
buildRPM "Installer.topo"
buildRPM "Installer.gfe"
buildRPM "Installer.hydroapps"

2
rpms/awips2.upc/Installer.edex-upc/programs/edex
View file

@ -25,7 +25,7 @@
# ChangeLog #
# 07/2011 M.James/Unidata Created #
# 10/2015 M.James/Unidata Log files fixed; purge check added #
# 11/2015 M.James/Unidata Added CAVE useri count as "edex users" #
# 11/2015 M.James/Unidata Added CAVE user count as "edex users" #
#-----------------------------------------------------------------------#
# directories definitions

26
rpms/build/x86_64/build.sh
View file

@ -519,8 +519,10 @@ fi
if [ "${1}" = "-other" ]; then
buildRPM "awips2-cli"
buildRPM "awips2-hydroapps-shared"
buildRPM "awips2-gfesuite-client"
buildRPM "awips2-gfesuite-server"
#buildRPM "awips2-yajsw"
#buildRPM "awips2-hydroapps-shared" # disabled - removed from repo comps.xml
#buildRPM "awips2-tools"
#buildRPM "awips2-pypies"
#buildRPM "awips2-adapt-native"
@ -528,35 +530,15 @@ if [ "${1}" = "-other" ]; then
##buildRPM "awips2-edex-environment"
#buildRPM "awips2-data.gfe"
#buildRPM "awips2-data.hdf5-topo"
#buildRPM "awips2-gfesuite-client"
#buildRPM "awips2-gfesuite-server"
#buildRPM "awips2-groovy"
fi
if [ "${1}" = "-viz" ]; then
#buildRPM "awips2"
#buildRPM "awips2-common-base"
#buildRPM "awips2-python-numpy"
#buildRPM "awips2-ant"
#buildRPM "awips2-python-dynamicserialize"
#buildRPM "awips2-python"
#buildRPM "awips2-adapt-native"
#unpackHttpdPypies
#if [ $? -ne 0 ]; then
# exit 1
#fi
#buildRPM "awips2-httpd-pypies"
#buildRPM "awips2-hydroapps-shared"
#buildRPM "awips2-rcm"
#buildRPM "awips2-gfesuite-client"
#buildRPM "awips2-gfesuite-server"
#buildRPM "awips2-tools"
#buildRPM "awips2-cli"
buildCAVE
if [ $? -ne 0 ]; then
exit 1
fi
buildRPM "awips2-alertviz"
#buildRPM "awips2-alertviz"
exit 0
fi

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="14.4.1"
export BUILD_NUMBER="9"
export BUILD_NUMBER="11"
export AWIPSII_RELEASE="10n${BUILD_NUMBER}"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"