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

hydroapps copy large files from awips-scm; edex-upc dependencies added for install order

Browse source 
Former-commit-id: b776244703
Former-commit-id: a547de2b85
This commit is contained in:
mjames-upc 2015-09-07 21:27:23 -06:00
parent bc361dffbf
commit 9c290e32c0
5 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rpms/awips2.core/Installer.hydroapps/component.spec
View file

@ -48,6 +48,10 @@ FILES_NATIVE="%{_baseline_workspace}/files.native"
if [ $? -ne 0 ]; then
exit 1
fi
/bin/cp /awips2/jenkins/buildspace/workspace/awipscm/awips2-static/hydroapps/library.ohd.ofs.so \
%{_build_root}/awips2/edex/data/share/hydroapps/lib/native/linux32/
/bin/cp /awips2/jenkins/buildspace/workspace/awipscm/awips2-static/hydroapps/library.ohd.pproc.so \
%{_build_root}/awips2/edex/data/share/hydroapps/lib/native/linux32/
/usr/bin/find %{_build_root}/awips2/edex/data/share -name .gitignore -exec rm -rf {} \;
if [ $? -ne 0 ]; then

1
rpms/awips2.upc/Installer.edex-upc/component.spec
View file

@ -16,6 +16,7 @@ Packager: Michael James
AutoReq: no
Requires: awips2-tools, awips2-edex-configuration, awips2-database-standalone-configuration
Requires: awips2-qpid-java-broker, awips2-postgresql, awips2-httpd-pypies
Requires: ksh, libstdc++(x86-32), libgfortran(x86-32)
provides: awips2-edex-upc

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

@ -277,13 +277,13 @@ if [ "${1}" = "-httpd" ]; then
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-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-pgadmin3"
exit 0
fi
@ -518,19 +518,19 @@ if [ "${1}" = "-cave" ]; then
fi
if [ "${1}" = "-other" ]; then
buildRPM "awips2-yajsw"
#buildRPM "awips2-yajsw"
buildRPM "awips2-hydroapps-shared"
buildRPM "awips2-tools"
buildRPM "awips2-pypies"
buildRPM "awips2-adapt-native"
buildRPM "awips2-aviation-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-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

4
rpms/unidata/build.sh
View file

@ -109,10 +109,10 @@ 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/python_14.4.1/x86_64/
mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* /awips2/jenkins/build/rpms/awips2_14.4.1/x86_64/
fi
if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/noarch/)" ]; then
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* /awips2/jenkins/build/rpms/python_14.4.1/noarch/
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* /awips2/jenkins/build/rpms/awips2_14.4.1/noarch/
fi
END_TIME=`date "+%s"`

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="14.4.1"
export BUILD_NUMBER="8"
export BUILD_NUMBER="11"
export AWIPSII_RELEASE="5n${BUILD_NUMBER}"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"