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

a lot of build updates for 14.4.1. removed desktop autostart stuff, edits to get wes2bridge to build, and reoganization of UPC build programs.

Browse source 
Former-commit-id: 1a280b79d6
This commit is contained in:
mjames-upc 2015-02-12 21:55:36 -07:00
parent 2743dfdbef
commit 38cf8403cb
15 changed files with 84 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/build/alertviz/build.properties
View file

@ -36,9 +36,9 @@ collectingFolder=${archivePrefix}
# configs=win32,win32,x86 & linux,motif,x86
# By default the value is *,*,*
#configs = *, *, *
configs=linux, gtk, x86 & \
linux, gtk, x86_64 & \
win32, win32, x86
configs=linux, gtk, x86_64
# linux, gtk, x86_64 & \
# win32, win32, x86
# win32, win32, x86 & \
# linux, gtk, x86_64 & \
# linux, motif, x86 & \
@ -125,7 +125,7 @@ baseLocation=${base}/eclipse
#Os/Ws/Arch/nl of the eclipse specified by baseLocation
baseos=linux
basews=gtk
basearch=x86
basearch=x86_64
#this property indicates whether you want the set of plug-ins and features to be considered during the build to be limited to the ones reachable from the features / plugins being built
filteredDependencyCheck=false

8
cave/build/cave/build.properties
View file

@ -46,9 +46,9 @@ collectingFolder=${archivePrefix}
# configs=win32,win32,x86 & linux,motif,x86
# By default the value is *,*,*
#configs = *, *, *
configs=linux, gtk, x86 & \
linux, gtk, x86_64 & \
win32, win32, x86
configs=linux, gtk, x86_64
# linux, gtk, x86_64 & \
# win32, win32, x86
# win32, win32, x86 & \
# linux, gtk, x86_64 & \
# linux, motif, x86 & \
@ -134,7 +134,7 @@ timestamp=007
#Os/Ws/Arch/nl of the eclipse specified by baseLocation
baseos=linux
basews=gtk
basearch=x86
basearch=x86_64
#this property indicates whether you want the set of plug-ins and features to be considered during the build to be limited to the ones reachable from the features / plugins being built
filteredDependencyCheck=false

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

@ -297,10 +297,12 @@
<param name="feature"
value="com.raytheon.uf.viz.registry.feature" />
</antcall>
<!--
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.datadelivery.feature" />
</antcall>
-->
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.npp.feature" />

4
javaUtilities/build.wes2bridge.utility/ant/setup.xml
View file

@ -6,7 +6,7 @@
<property name="destination.directory"
value="" />
<!-- The location of uframe-eclipse. -->
<property name="eclipse.directory" value="/opt/uframe-eclipse" />
<property name="eclipse.directory" value="/awips2/eclipse" />
<!-- Used to indicate if this is part of an rpm build. -->
<property name="rpm.build" value="false" />
@ -29,4 +29,4 @@
<var name="bin.dir" value="bin" />
</else>
</if>
</project>
</project>

4
javaUtilities/build.wes2bridge.utility/build.xml
View file

@ -1,6 +1,6 @@
<project default="build" basedir=".">
<property name="eclipse.dir"
value="/opt/uframe-eclipse" />
value="/awips2/eclipse" />
<target name="init">
<antcall target="clean" />
@ -57,4 +57,4 @@
<taskdef resource="net/sf/antcontrib/antlib.xml"
classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
</project>
</project>

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

@ -5,7 +5,7 @@
export BUILDROOT_DIR="/tmp/awips-component"
export RPM_BUILD_ROOT="${BUILDROOT_DIR}"
export UFRAME_ECLIPSE_DIR="/opt/uframe-eclipse"
export UFRAME_ECLIPSE_DIR="/awips2/eclipse"
export WORKSPACE_DIR=`cd ../../../; pwd;`
export AWIPSCM_SHARE="/awipscm"

7
rpms/awips2.cave/Installer.cave/scripts/autostart/awips2-textws.desktop
View file

@ -1,7 +0,0 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
Version=1.0
Name=No Name
Name[en_US]=TextWS
Exec=/bin/bash -i -c "sleep 5; /awips2/cave/textWS.sh"

12
rpms/awips2.cave/deploy.builder/build.sh
View file

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -v
# This script will build the AWIPS II Viz RPMs.
# Build Variables:
@ -22,7 +22,9 @@ fi
function prepareBuildEnvironment()
{
if [ "${AWIPSII_TOP_DIR}" = "" ]; then
export AWIPSII_TOP_DIR="${VAR_AWIPSII_TOP_DIR}"
# /awips2/jenkins/buildspace/workspace/tmp/rpms_built_dir/
#export AWIPSII_TOP_DIR="${VAR_AWIPSII_TOP_DIR}"
export AWIPSII_TOP_DIR="${VAR_WORKSPACE}/tmp/rpms_built_dir"
fi
if [ "${WORKSPACE}" = "" ]; then
@ -71,10 +73,10 @@ function setTargetArchitecture()
}
export TARGET_BUILD_ARCH=
# If the architecture has not been specified, default to 32-bit.
# If the architecture has not been specified, default to 64-bit.
if [ "${CAVE_BUILD_ARCH}" = "" ]; then
export CAVE_BUILD_ARCH="x86"
echo "The Build Architecture was not specified ... defaulting to x86."
export CAVE_BUILD_ARCH="x86_64"
echo "The Build Architecture was not specified ... defaulting to x86_64."
else
echo "Building for architecture ... ${CAVE_BUILD_ARCH}."
fi

2
rpms/awips2.core/Installer.edex-environment/wes2bridge.files/build/build.sh
View file

@ -5,7 +5,7 @@ export U_RPM_DESTINATION="/home/bkowal/rpmbuild"
export U_COMPONENT_VERSION="11.9.0"
export U_COMPONENT_RELEASE="1"
export U_BUILD_ROOT="/tmp/${USER}/awips2-build"
export U_UFRAME_ECLIPSE="/opt/uframe-eclipse"
export U_UFRAME_ECLIPSE="/awips2/eclipse"
export U_BASELINE_WORKSPACE="/common/bkowal/workspace"
# build variables

1
rpms/build/common/usage.sh
View file

@ -12,6 +12,7 @@ function usage()
echo " -viz only build the Viz rpms (CAVE & AlertViz)."
echo " -edex only build the EDEX rpms."
echo " -shp only build the EDEX shapefile rpm."
echo " -python build Python rpms."
echo " -qpid build only the QPID rpms."
echo " -ldm build the awips2-ldm rpm; requires root privileges."
echo " -upc build the awips2-edex-upc rpm."

2
rpms/build/i386/buildEnvironment.sh
View file

@ -6,6 +6,6 @@ export AWIPSII_RELEASE="20120223"
export AWIPSII_TOP_DIR="/home/bkowal/rpmbuild"
export WORKSPACE="/common/bkowal/git/thunder/baseline"
export UFRAME_ECLIPSE="/opt/uframe-eclipse"
export UFRAME_ECLIPSE="/awips2/eclipse"
export AWIPSCM_SHARE="/awipscm"
export AWIPSII_BUILD_ROOT="/tmp/${USER}/awips-component"

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

@ -112,6 +112,35 @@ if [ "${1}" = "-WA" ]; then
exit 0
fi
if [ "${1}" = "-python" ]; then
buildRPM "awips2-python"
buildRPM "awips2-python-cherrypy"
buildRPM "awips2-python-dynamicserialize"
buildRPM "awips2-python-h5py"
buildRPM "awips2-python-jimporter"
buildRPM "awips2-python-matplotlib"
buildRPM "awips2-python-nose"
buildRPM "awips2-python-numpy"
buildRPM "awips2-python-pil"
buildRPM "awips2-python-pmw"
buildRPM "awips2-python-pupynere"
#buildRPM "awips2-python-qpid"
buildRPM "awips2-python-scientific"
buildRPM "awips2-python-scipy"
buildRPM "awips2-python-tables"
buildRPM "awips2-python-thrift"
buildRPM "awips2-python-tpg"
buildRPM "awips2-python-ufpy"
buildRPM "awips2-python-werkzeug"
buildRPM "awips2-python-pygtk"
buildRPM "awips2-python-pycairo"
buildRPM "awips2-python-shapely"
buildRPM "awips2-notification"
exit 0
fi
if [ "${1}" = "-64bit" ]; then
buildCAVE
if [ $? -ne 0 ]; then
@ -473,6 +502,24 @@ if [ "${1}" = "-cave" ]; then
buildCAVEsingle
fi
if [ "${1}" = "-other" ]; then
buildRPM "awips2-yajsw"
#buildRPM "awips2-hydroapps-shared"
#buildRPM "awips2-tools"
#buildRPM "awips2-pypies"
#buildRPM "awips2-adapt-native"
#buildRPM "awips2-aviation-shared"
##buildRPM "awips2-edex-environment"
#buildRPM "awips2-cli"
#buildRPM "awips2-data.gfe"
#buildRPM "awips2-data.hdf5-topo"
#buildRPM "awips2-gfesuite-client"
#buildRPM "awips2-gfesuite-server"
#buildRPM "awips2-groovy"
#buildRPM "awips2-httpd-pypies"
#buildRPM "awips2-localapps-environment"
fi
if [ "${1}" = "-viz" ]; then
buildRPM "awips2"
buildRPM "awips2-common-base"

21
rpms/unidata/build.sh
View file

@ -45,18 +45,12 @@ echo WORKSPACE is ${WORKSPACE}
# prepare the baseline
pushd . > /dev/null 2>&1
cd ${BASELINE}
#if [ -d ${WORKSPACE} ]; then
# rm -rf ${WORKSPACE}
#fi
#mkdir -p ${WORKSPACE}
RSYNC_DIRS=`cat $dir/rsync.dirs`
rsync -ruql --delete --exclude-from=${dir}/excludes \
RadarServer/* cots/* edexOsgi/* cave/* ncep/* ost/* localization/* \
javaUtilities/* rpms pythonPackages nativeLib/* \
${WORKSPACE}
rsync -ruql --delete --exclude-from=${dir}/excludes ${RSYNC_DIRS} ${WORKSPACE}
cp ${dir}/p2-build.xml.local ${WORKSPACE}/build/p2-build.xml
cp ${dir}/edex_build.xml ${WORKSPACE}/build.edex/build.xml
#cp ${dir}/p2-build.xml.local ${WORKSPACE}/build/p2-build.xml
#cp ${dir}/edex_build.xml ${WORKSPACE}/build.edex/build.xml
mkdir -p ${WORKSPACE}/build.edex/esb/logs
mkdir -p ${WORKSPACE}/build.edex/esb/data/manual
@ -88,15 +82,12 @@ cp -v ${dir}/buildEnvironment.sh .
# check rpms/build/x86_64/build.sh for these groups
#
# PRIMARY GROUPS confirmed to work for Unidata 14.2.1
/bin/bash build.sh ${1} > ${dir}/build${1}-${timestamp}.log
#/bin/bash build.sh -edex > ${dir}/build-EDEX-${timestamp}.log
/bin/bash build.sh -full > ${dir}/build-FULL-${timestamp}.log
#/bin/bash build.sh -local > ${dir}/build-LOCAL-${timestamp}.log
#/bin/bash build.sh -viz > ${dir}/build-VIZ-${timestamp}.log
#/bin/bash build.sh -upc > ${dir}/build-UPC-${timestamp}.log
#/bin/bash build.sh -ldm > ${dir}/build-LDM-${timestamp}.log
#/bin/bash build.sh -httpd > ${dir}/build-LDM-${timestamp}.log
#/bin/bash build.sh -postgres > ${dir}/build-${timestamp}.log
#/bin/bash build.sh -qpid > ${dir}/build-QPID-${timestamp}.log
#/bin/bash build.sh -python-qpid > ${dir}/build-${timestamp}.log

4
rpms/unidata/edex_build.xml
View file

@ -94,14 +94,17 @@
<param name="feature"
value="com.raytheon.uf.edex.registry.client.feature" />
</antcall>
<!--
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.datadelivery.client.feature" />
</antcall>
-->
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.registry.feature" />
</antcall>
<!--
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.datadelivery.core.feature" />
@ -114,6 +117,7 @@
<param name="feature"
value="com.raytheon.uf.edex.dataprovideragent.feature" />
</antcall>
-->
<!-- SPECIAL CASE -->
<if>

2
rpms/unidata/p2-build.xml.local
View file

@ -269,10 +269,12 @@
<param name="feature"
value="com.raytheon.uf.viz.thinclient.feature" />
</antcall>
<!--
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.datadelivery.feature" />
</antcall>
-->
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.useradmin.feature" />