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

Merge branch 'omaha_14.1.1' (14.1.1-9) into development

Browse source 
Conflicts:
	cots/org.jep.linux32/libjep.so
	cots/org.jep.linux64/libjep.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
      (took all the omaha_14.1.1 versions)

Former-commit-id: 6d9efac6ef [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]
Former-commit-id: 0a36987a01
This commit is contained in:
Steve Harris 2013-11-15 13:15:25 -06:00
commit 542a0946f2
10 changed files with 42 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
cave/build/static/linux/cave/awips2VisualizeUtility.sh
View file

@ -34,47 +34,47 @@
# This script will kill any running AlertViz and/or Cave # This script will kill any running AlertViz and/or Cave
# processes when a user logs off. # processes when a user logs off.
if [ ! -f ${HOME}/vizUtility.log ]; then if [ ! -f /tmp/vizUtility.log ]; then
touch ${HOME}/vizUtility.log touch /tmp/vizUtility.log
else else
echo "" >> ${HOME}/vizUtility.log echo "" > /tmp/vizUtility.log
fi fi
date >> ${HOME}/vizUtility.log date >> /tmp/vizUtility.log
function findAlertvizProcesses { function findAlertvizProcesses {
# Find all the alertviz processes. # Find all the alertviz processes.
echo "Searching for alertviz processes." >> ${HOME}/vizUtility.log echo "Searching for alertviz processes." >> /tmp/vizUtility.log
zpid=` ps u -u $USER | grep '[a]lertviz' | awk '{print $2}' ` zpid=` ps u -u $USER | grep '[a]lertviz' | awk '{print $2}' `
npid=` echo $zpid | wc -w ` npid=` echo $zpid | wc -w `
if [ $npid -le 0 ] if [ $npid -le 0 ]
then then
echo "There are no alertviz processes found." >> ${HOME}/vizUtility.log echo "There are no alertviz processes found." >> /tmp/vizUtility.log
date >> ${HOME}/vizUtility.log date >> /tmp/vizUtility.log
fi fi
} }
function findAlertvizShProcesses { function findAlertvizShProcesses {
# Find all the alertviz.sh processes. # Find all the alertviz.sh processes.
echo "Searching for alertviz.sh processes." >> ${HOME}/vizUtility.log echo "Searching for alertviz.sh processes." >> /tmp/vizUtility.log
zpid=` ps u -u $USER | grep '[a]lertviz.sh' | awk '{print $2}' ` zpid=` ps u -u $USER | grep '[a]lertviz.sh' | awk '{print $2}' `
npid=` echo $zpid | wc -w ` npid=` echo $zpid | wc -w `
if [ $npid -le 0 ] if [ $npid -le 0 ]
then then
echo "There are no alertviz.sh processes found." >> ${HOME}/vizUtility.log echo "There are no alertviz.sh processes found." >> /tmp/vizUtility.log
date >> ${HOME}/vizUtility.log date >> /tmp/vizUtility.log
fi fi
} }
function findCaveProcesses { function findCaveProcesses {
# Find all the Cave processes. # Find all the Cave processes.
echo "Searching for cave processes." >> ${HOME}/vizUtility.log echo "Searching for cave processes." >> /tmp/vizUtility.log
zpid=` ps u -u $USER | grep '[c]ave' | awk '{print $2}' ` zpid=` ps u -u $USER | grep '[c]ave' | awk '{print $2}' `
npid=` echo $zpid | wc -w ` npid=` echo $zpid | wc -w `
if [ $npid -le 0 ] if [ $npid -le 0 ]
then then
echo "There are no cave processes found." >> ${HOME}/vizUtility.log echo "There are no cave processes found." >> /tmp/vizUtility.log
date >> ${HOME}/vizUtility.log date >> /tmp/vizUtility.log
fi fi
} }
@ -83,22 +83,22 @@ fi
findAlertvizShProcesses findAlertvizShProcesses
for pid in $zpid for pid in $zpid
do do
echo "Attempting to kill 'alertviz.sh' process with pid ${pid}." >> ${HOME}/vizUtility.log echo "Attempting to kill 'alertviz.sh' process with pid ${pid}." >> /tmp/vizUtility.log
kill ${pid} 2>> ${HOME}/vizUtility.log kill ${pid} 2>> /tmp/vizUtility.log
done done
findAlertvizProcesses findAlertvizProcesses
for pid in $zpid for pid in $zpid
do do
echo "Attempting to kill 'alertviz' process with pid ${pid}." >> ${HOME}/vizUtility.log echo "Attempting to kill 'alertviz' process with pid ${pid}." >> /tmp/vizUtility.log
kill ${pid} 2>> ${HOME}/vizUtility.log kill ${pid} 2>> /tmp/vizUtility.log
done done
findCaveProcesses findCaveProcesses
for pid in $zpid for pid in $zpid
do do
echo "Attempting to kill 'cave' process with pid ${pid}." >> ${HOME}/vizUtility.log echo "Attempting to kill 'cave' process with pid ${pid}." >> /tmp/vizUtility.log
kill ${pid} 2>> ${HOME}/vizUtility.log kill ${pid} 2>> /tmp/vizUtility.log
done done
@ -112,14 +112,14 @@ while [[ $npid -ne 0 && $ntoomany -ne 0 ]]
do do
for pid in $zpid for pid in $zpid
do do
echo "Attempting to kill 'alertviz.sh' process with pid ${pid}." >> ${HOME}/vizUtility.log echo "Attempting to kill 'alertviz.sh' process with pid ${pid}." >> /tmp/vizUtility.log
kill -9 ${pid} 2>> ${HOME}/vizUtility.log kill -9 ${pid} 2>> /tmp/vizUtility.log
done done
npid=0 npid=0
((ntoomany-=1)) ((ntoomany-=1))
if [ $ntoomany -le 1 ] if [ $ntoomany -le 1 ]
then then
echo "The kill alertviz portion of this script $0 has been unable preform its duties. 02" >> ${HOME}/vizUtility.log echo "The kill alertviz portion of this script $0 has been unable preform its duties. 02" >> /tmp/vizUtility.log
break break
fi fi
sleep 1 sleep 1
@ -131,20 +131,20 @@ sleep 1
findAlertvizProcesses findAlertvizProcesses
for pid in $zpid for pid in $zpid
do do
echo "Attempting to kill 'alertviz' process with pid ${pid}." >> ${HOME}/vizUtility.log echo "Attempting to kill 'alertviz' process with pid ${pid}." >> /tmp/vizUtility.log
kill -9 ${pid} 2>> ${HOME}/vizUtility.log kill -9 ${pid} 2>> /tmp/vizUtility.log
done done
findCaveProcesses findCaveProcesses
for pid in $zpid for pid in $zpid
do do
echo "Attempting to kill 'cave' process with pid ${pid}." >> ${HOME}/vizUtility.log echo "Attempting to kill 'cave' process with pid ${pid}." >> /tmp/vizUtility.log
kill -9 ${pid} 2>> ${HOME}/vizUtility.log kill -9 ${pid} 2>> /tmp/vizUtility.log
done done
date >> ${HOME}/vizUtility.log date >> /tmp/vizUtility.log
echo >> ${HOME}/vizUtility.log echo >> /tmp/vizUtility.log

BIN
cots/org.jep.linux32/libjep.so Normal file → Executable file
View file

Binary file not shown.

BIN
cots/org.jep.linux64/libjep.so Normal file → Executable file
View file

Binary file not shown.

2
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id
View file

@ -1 +1 @@
c88d3613a39e17ebcd002b7464f1f7d68c89f86a 8fe0a749af6fc67549da23d33fd3d63a094c1466

2
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id
View file

@ -1 +1 @@
c88d3613a39e17ebcd002b7464f1f7d68c89f86a 8fe0a749af6fc67549da23d33fd3d63a094c1466

6
rpms/awips2.core/Installer.ldm/component.spec
View file

@ -9,7 +9,7 @@
Name: awips2-ldm Name: awips2-ldm
Summary: AWIPS II LDM Distribution Summary: AWIPS II LDM Distribution
Version: %{_ldm_version} Version: %{_ldm_version}
Release: 8 Release: 9
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch
@ -177,7 +177,9 @@ chown -R ldm:fxalpha ${_ldm_dir}
# create .bash_profile # create .bash_profile
if [ ! -f /usr/local/ldm/.bash_profile ]; then if [ ! -f /usr/local/ldm/.bash_profile ]; then
echo 'export PATH=$HOME/decoders:$HOME/util:$HOME/bin:$PATH' > \ echo 'umask 002' > \
/usr/local/ldm/.bash_profile
echo 'export PATH=$HOME/decoders:$HOME/util:$HOME/bin:$PATH' >> \
/usr/local/ldm/.bash_profile /usr/local/ldm/.bash_profile
echo 'export MANPATH=$HOME/share/man:/usr/share/man' >> \ echo 'export MANPATH=$HOME/share/man:/usr/share/man' >> \
/usr/local/ldm/.bash_profile /usr/local/ldm/.bash_profile

4
rpms/awips2.core/Installer.ldm/patch/init.d/ldmcp
View file

@ -30,12 +30,12 @@ function handle_ramdisk() {
if ! mount | grep ram0 > /dev/null if ! mount | grep ram0 > /dev/null
then then
echo -ne "Creating RAMDISK:\t" echo -ne "Creating RAMDISK:\t"
if mkfs -t ext2 -m 0 -q /dev/ramdisk 1500000 && success || failure if mkfs -t ext2 -m 0 -q /dev/ram0 1500000 && success || failure
then then
echo echo
# mount to /data/ldm/data # mount to /data/ldm/data
echo -ne "Mounting to /data/ldm/data:\t" echo -ne "Mounting to /data/ldm/data:\t"
if ! mount /dev/ramdisk /data/ldm/data && failure if ! mount /dev/ram0 /data/ldm/data && failure
then then
echo echo
return 1 return 1

BIN
rpms/awips2.core/Installer.ldm/src/ldm-6.11.5.tar.gz
View file

Binary file not shown.

BIN
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so Normal file → Executable file
View file

Binary file not shown.

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

@ -411,13 +411,14 @@ if [ "${1}" = "-viz" ]; then
buildRPM "awips2" buildRPM "awips2"
buildRPM "awips2-common-base" buildRPM "awips2-common-base"
#buildRPM "awips2-python-dynamicserialize" #buildRPM "awips2-python-dynamicserialize"
#buildRPM "awips2-adapt-native" buildRPM "awips2-python"
buildRPM "awips2-adapt-native"
#unpackHttpdPypies #unpackHttpdPypies
#if [ $? -ne 0 ]; then #if [ $? -ne 0 ]; then
# exit 1 # exit 1
#fi #fi
#buildRPM "awips2-httpd-pypies" #buildRPM "awips2-httpd-pypies"
#buildRPM "awips2-hydroapps-shared" buildRPM "awips2-hydroapps-shared"
#buildRPM "awips2-rcm" #buildRPM "awips2-rcm"
#buildRPM "awips2-tools" #buildRPM "awips2-tools"
#buildRPM "awips2-cli" #buildRPM "awips2-cli"
@ -446,7 +447,9 @@ if [ "${1}" = "-custom" ]; then
#if [ $? -ne 0 ]; then #if [ $? -ne 0 ]; then
# exit 1 # exit 1
#fi #fi
buildRPM "awips2-alertviz" buildRPM "awips2-adapt-native"
buildRPM "awips2-hydroapps-shared"
#buildRPM "awips2-alertviz"
#buildRPM "awips2-python" #buildRPM "awips2-python"
#buildRPM "awips2-alertviz" #buildRPM "awips2-alertviz"
#buildRPM "awips2-eclipse" #buildRPM "awips2-eclipse"