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

build updates

Browse source 
Former-commit-id: 9c284dc55c32b83f8d985aaa80d507cb53eba0fe
This commit is contained in:
mjames-upc 2015-08-19 12:45:51 -06:00
parent f11c4297a6
commit 6cfaae2ce7
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpms/build/common/lookupRPM.sh
View file

@ -55,7 +55,7 @@ function lookupRPM()
return 0 return 0
fi fi
if [ "${1}" = "awips2-python-matplotlib" ]; then if [ "${1}" = "awips2-python-matplotlib" ]; then
export RPM_SPECIFICATION="${installer_dir}/matplotlib-1.4.3/" export RPM_SPECIFICATION="${installer_dir}/matplotlib-1.2.0/"
return 0 return 0
fi fi
if [ "${1}" = "awips2-python-nose" ]; then if [ "${1}" = "awips2-python-nose" ]; then

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

@ -123,12 +123,12 @@ if [ "${1}" = "-python" ]; then
#buildRPM "awips2-python-dynamicserialize" #buildRPM "awips2-python-dynamicserialize"
#buildRPM "awips2-python-h5py" #buildRPM "awips2-python-h5py"
#buildRPM "awips2-python-jimporter" #buildRPM "awips2-python-jimporter"
#buildRPM "awips2-python-matplotlib" buildRPM "awips2-python-matplotlib"
#buildRPM "awips2-python-nose" #buildRPM "awips2-python-nose"
#buildRPM "awips2-python-cython" #buildRPM "awips2-python-cython"
#buildRPM "awips2-python-six" #buildRPM "awips2-python-six"
#buildRPM "awips2-python-dateutil" #buildRPM "awips2-python-dateutil"
buildRPM "awips2-python-numpy" #buildRPM "awips2-python-numpy"
#buildRPM "awips2-python-pil" #buildRPM "awips2-python-pil"
#buildRPM "awips2-python-pmw" #buildRPM "awips2-python-pmw"
#buildRPM "awips2-python-pupynere" #buildRPM "awips2-python-pupynere"
@ -600,7 +600,7 @@ if [ "${1}" = "-custom" ]; then
fi fi
if [ "${1}" = "-qpid" ]; then if [ "${1}" = "-qpid" ]; then
buildRPM "awips2-python-qpid" #buildRPM "awips2-python-qpid"
buildQPID buildQPID
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1

4
rpms/unidata/buildEnvironment.sh
View file

@ -13,8 +13,8 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace
# baseline is... # baseline is...
export BASELINE="${JENKINS_WORKSPACE}" export BASELINE="${JENKINS_WORKSPACE}"
export AWIPSII_VERSION="14.4.1" export AWIPSII_VERSION="14.4.1"
export BUILD_NUMBER="6" export BUILD_NUMBER="1"
export AWIPSII_RELEASE="2n${BUILD_NUMBER}" export AWIPSII_RELEASE="3n${BUILD_NUMBER}"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir" export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"