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

build updates

Browse source 
Former-commit-id: a3cef2f93b [formerly 6f457198ce]
Former-commit-id: e9ec10cbc4
This commit is contained in:
AWIPS User 2015-04-24 06:23:59 -06:00
parent e6600c7119
commit 98f56937b5
5 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpms/awips2.core/Installer.localization/component.spec
View file

@ -60,7 +60,7 @@ if [ $? -ne 0 ]; then
fi
# Copy the shapefiles (too large to include in git repo)
cp -rv /machine/awips2/jenkins/buildspace/workspace/awipscm/awips2-static/shapefiles/ \
cp -rv /awips2/jenkins/buildspace/workspace/awipscm/awips2-static/shapefiles/ \
${RPM_BUILD_ROOT}/awips2/edex/data/utility/edex_static/site/%{_localization_site}/
if [ $? -ne 0 ]; then
exit 1

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

@ -119,7 +119,7 @@ function lookupRPM()
return 0
fi
if [ "${1}" = "awips2-python-shapely" ]; then
export RPM_SPECIFICATION="${installer_dir}/shapely-1.3.3/"
export RPM_SPECIFICATION="${installer_dir}/shapely-1.4.4/"
return 0
fi

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

@ -229,7 +229,9 @@ function unpackHttpdPypies()
# into the: ${AWIPSII_TOP_DIR}/SOURCES directory.
awips2_core_directory=${WORKSPACE}/rpms/awips2.core
httpd_pypies_directory=${awips2_core_directory}/Installer.httpd-pypies
echo httpd_pypies_directory=${httpd_pypies_directory}
httpd_SOURCES=${httpd_pypies_directory}/src/httpd-2.2.15-SOURCES.tar
echo httpd_SOURCES=${httpd_SOURCES}
/bin/tar -xvf ${httpd_SOURCES} -C ${AWIPSII_TOP_DIR}/SOURCES
if [ $? -ne 0 ]; then

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

@ -263,17 +263,21 @@ if [ "${1}" = "-rh6" ]; then
fi
if [ "${1}" = "-httpd" ]; then
unpackHttpdPypies
if [ $? -ne 0 ]; then
exit 1
fi
buildRPM "awips2-httpd-pypies"
exit 0
fi
if [ "${1}" = "-postgres" ]; then
buildRPM "awips2-postgres"
#buildRPM "awips2-database-server-configuration"
#buildRPM "awips2-database-standalone-configuration"
#buildRPM "awips2-database"
#buildRPM "awips2-maps-database"
#buildRPM "awips2-ncep-database"
#buildRPM "awips2-pgadmin3"
# buildRPM "awips2-postgres"
# buildRPM "awips2-database-server-configuration"
# buildRPM "awips2-database-standalone-configuration"
# buildRPM "awips2-database"
# buildRPM "awips2-maps-database"
# buildRPM "awips2-ncep-database"
buildRPM "awips2-pgadmin3"
exit 0
fi
@ -336,7 +340,7 @@ if [ "${1}" = "-full" ]; then
# netcdf-devel or exactly how
# netcdf-AWIPS these are built )
#
# WHAT IS BEING BUILT for 14.2.1
# WHAT IS BEING BUILT for 14.4.1
#
buildRPM "awips2-postgres"
buildRPM "awips2-python"
@ -509,25 +513,23 @@ 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-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"
buildRPM "awips2-cli"
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"
#buildRPM "awips2-common-base"
#buildRPM "awips2-python-numpy"
#buildRPM "awips2-ant"
#buildRPM "awips2-python-dynamicserialize"

2
rpms/unidata/buildEnvironment.sh
View file

@ -7,7 +7,7 @@ export BUILD_DIR=/awips2/jenkins/buildspace/
# Not sure why, but ld isn't finding /awips2/python/lib/libpython2.7.so
# Need to create sym link:
# /usr/lib64/libpython2.7.so -> /awips2/python/lib/libpython2.7.so
export LD_LIBRARY_PATH=/machine/awips2/python/lib:/usr/lib64
export LD_LIBRARY_PATH=/awips2/python/lib:/usr/lib64
export BUILD_WORKSPACE=${BUILD_DIR}/workspace
# baseline is...