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

building 16.1.4-4 on moe

Browse source
This commit is contained in:
mjames-upc 2016-04-13 14:19:19 -06:00
parent 60f15d13f6
commit ad95e20449
5 changed files with 5 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -123,7 +123,7 @@ if [ "${1}" = "-pydev" ]; then
#buildRPM "awips2-python"
#buildRPM "awips2-python-awips"
#buildRPM "awips2-python-jep"
buildRPM "awips2-python-numpy"
#buildRPM "awips2-python-numpy"
#buildRPM "awips2-python-pyparsing"
#buildRPM "awips2-python-six"
#buildRPM "awips2-python-nose"
@ -136,7 +136,7 @@ if [ "${1}" = "-pydev" ]; then
#buildRPM "awips2-python-metpy"
#buildRPM "awips2-python-cartopy"
#buildRPM "awips2-python-scipy"
buildRPM "awips2-python-scipy"
#buildRPM "awips2-python-matplotlib"
#buildRPM "awips2-python-basemap"

1
rpms/python.site-packages/Installer.numpy/component.spec
View file

@ -74,7 +74,6 @@ if [ ! -d numpy-%{version} ]; then
file numpy-%{version}
exit 1
fi
source /etc/profile.d/awips2.sh
RC=$?
if [ ${RC} -ne 0 ]; then
exit 1

1
rpms/python.site-packages/Installer.scipy/component.spec
View file

@ -69,7 +69,6 @@ fi
export BLAS=/awips2/python/lib
export LAPACK=/awips2/python/lib
source /etc/profile.d/awips2.sh
RC=$?
if [ ${RC} -ne 0 ]; then
exit 1

34
rpms/unidata/build.sh
View file

@ -38,7 +38,6 @@ mkdir -p ${AWIPSII_TOP_DIR}/RPMS
mkdir -p ${AWIPSII_TOP_DIR}/SOURCES
mkdir -p ${AWIPSII_TOP_DIR}/SPECS
mkdir -p ${AWIPSII_TOP_DIR}/SRPMS
echo BASELINE is ${BASELINE}
echo WORKSPACE is ${WORKSPACE}
@ -46,18 +45,10 @@ echo WORKSPACE is ${WORKSPACE}
pushd . > /dev/null 2>&1
cd ${BASELINE}
RSYNC_DIRS=`cat $dir/rsync.dirs`
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
#mkdir -p ${WORKSPACE}/build.edex/esb/logs
#mkdir -p ${WORKSPACE}/build.edex/esb/data/manual
#mkdir -p ${WORKSPACE}/build.edex/esb/data/uEngine
popd > /dev/null 2>&1
# execute the build for the appropriate architecture
_rpms_build_directory=${WORKSPACE}/rpms/build
_architecture=`uname -i`
@ -67,7 +58,6 @@ pushd . > /dev/null 2>&1
cd ${_build_sh_directory}
cp -v ${dir}/buildEnvironment.sh .
#Usage: build.sh OPTION [-nobinlightning]
# -delta perform a build of only the rpms that are likely to change.
# -full perform a full build of all the rpms.
@ -81,33 +71,13 @@ cp -v ${dir}/buildEnvironment.sh .
#
# check rpms/build/x86_64/build.sh for these groups
#
/bin/bash build.sh ${1} > ${dir}/build${1}-${timestamp}.log
#/bin/bash build.sh -edex > ${dir}/build-EDEX-${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 -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
#/bin/bash build.sh -python > ${dir}/build-${timestamp}.log
#/bin/bash build.sh -psql > ${dir}/build-${timestamp}.log
#/bin/bash build.sh -java > ${dir}/build-${timestamp}.log
# remain untried / redundant
#/bin/bash build.sh -notification > ${dir}/build-notification-${timestamp}.log
#/bin/bash build.sh -ade > ${dir}/build-ade-${timestamp}.log
#/bin/bash build.sh -64bit > ${dir}/build-${timestamp}.log
#/bin/bash build.sh -ncep-database > ${dir}/build-${timestamp}.log
#/bin/bash build.sh -delta > ${dir}/build-${timestamp}.log
#/bin/bash build.sh -rh6 > ${dir}/build-rh6-${timestamp}.log
#/bin/bash build.sh -custom >> ${dir}/build-CUSTOM-${timestamp}.log
popd > /dev/null 2>&1
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_${AWIPSII_VERSION}/x86_64/
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="16.1.4"
export AWIPSII_RELEASE="3"
export AWIPSII_RELEASE="4"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"