From 8bfedf6eb3e11f34ee6ce4a89547101f11b95424 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Sun, 20 Mar 2016 13:58:56 -0600 Subject: [PATCH] we're using the new awips2-static repo for large files (maps.db, shapefiles, topo, etc.) closes #54. --- rpms/awips2.ade/deploy.builder/build.sh | 1 - rpms/awips2.cave/deploy.builder/build.sh | 1 - rpms/awips2.core/Installer.gfe/component.spec | 2 +- .../Installer.hydroapps/component.spec | 5 +++-- .../Installer.localization/component.spec | 2 +- .../Installer.maps-database/component.spec | 4 +--- .../Installer.ncep-database/component.spec | 8 ++++---- rpms/awips2.core/Installer.topo/component.spec | 10 +++------- .../Installer.edex-shapefiles/component.spec | 15 +-------------- rpms/awips2.edex/deploy.builder/build.sh | 5 ----- .../Installer.edex-shapefiles/component.spec | 4 +--- rpms/awips2.shapefiles/deploy.builder/build.sh | 5 ----- rpms/build/x86_64/build.sh | 15 +++++++++------ rpms/python.site-packages/deploy.builder/build.sh | 3 --- rpms/unidata/buildEnvironment.sh | 5 +++-- 15 files changed, 27 insertions(+), 58 deletions(-) diff --git a/rpms/awips2.ade/deploy.builder/build.sh b/rpms/awips2.ade/deploy.builder/build.sh index 1d837ed2c6..522334d2bd 100755 --- a/rpms/awips2.ade/deploy.builder/build.sh +++ b/rpms/awips2.ade/deploy.builder/build.sh @@ -7,7 +7,6 @@ export BUILDROOT_DIR="/tmp/awips-component" export RPM_BUILD_ROOT="${BUILDROOT_DIR}" export UFRAME_ECLIPSE_DIR="/awips2/eclipse" export WORKSPACE_DIR=`cd ../../../; pwd;` -export AWIPSCM_SHARE="/awips2/jenkins/buildspace/workspace/awipscm" if [ -d /tmp/awips-component ]; then rm -rf /tmp/awips-component diff --git a/rpms/awips2.cave/deploy.builder/build.sh b/rpms/awips2.cave/deploy.builder/build.sh index 5c2a35e9e2..7921ebaf44 100644 --- a/rpms/awips2.cave/deploy.builder/build.sh +++ b/rpms/awips2.cave/deploy.builder/build.sh @@ -9,7 +9,6 @@ VAR_AWIPSII_BUILD_ROOT="/tmp/awips-component" VAR_AWIPSII_VERSION="" VAR_AWIPSII_RELEASE="" VAR_UFRAME_ECLIPSE="/awips2/eclipse" -VAR_AWIPSCM_SHARE="/awips2/jenkins/buildspace/workspace/awipscm" # ----------------------------------------------------------------------------- if [ "${AWIPSII_TOP_DIR}" = "" ] && diff --git a/rpms/awips2.core/Installer.gfe/component.spec b/rpms/awips2.core/Installer.gfe/component.spec index 117a68ee49..689ad835ad 100644 --- a/rpms/awips2.core/Installer.gfe/component.spec +++ b/rpms/awips2.core/Installer.gfe/component.spec @@ -39,7 +39,7 @@ if [ $? -ne 0 ]; then exit 1 fi -GFE_SRC_DIR="${AWIPSCM_SHARE}/awips2-static/gfe" +GFE_SRC_DIR="%{_awipscm_share}/awips2-static/gfe" gfe_tar="${GFE_SRC_DIR}/gfeData.tgz" if [ ! -f ${gfe_tar} ]; then file ${gfe_tar} diff --git a/rpms/awips2.core/Installer.hydroapps/component.spec b/rpms/awips2.core/Installer.hydroapps/component.spec index 9e9b819bcd..f87626f8cb 100644 --- a/rpms/awips2.core/Installer.hydroapps/component.spec +++ b/rpms/awips2.core/Installer.hydroapps/component.spec @@ -48,9 +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 \ +/bin/cp %{_awipscm_share}/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 \ +/bin/cp %{_awipscm_share}/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 {} \; diff --git a/rpms/awips2.core/Installer.localization/component.spec b/rpms/awips2.core/Installer.localization/component.spec index 6d8738de4f..85c2da15f2 100644 --- a/rpms/awips2.core/Installer.localization/component.spec +++ b/rpms/awips2.core/Installer.localization/component.spec @@ -60,7 +60,7 @@ if [ $? -ne 0 ]; then fi # Copy the shapefiles (too large to include in git repo) -cp -rv /awips2/jenkins/buildspace/workspace/awipscm/awips2-static/shapefiles/ \ +cp -rv %{_awipscm_share}/awips2-static/shapefiles/ \ ${RPM_BUILD_ROOT}/awips2/edex/data/utility/edex_static/site/%{_localization_site}/ if [ $? -ne 0 ]; then exit 1 diff --git a/rpms/awips2.core/Installer.maps-database/component.spec b/rpms/awips2.core/Installer.maps-database/component.spec index 0bab7f7207..b752827900 100644 --- a/rpms/awips2.core/Installer.maps-database/component.spec +++ b/rpms/awips2.core/Installer.maps-database/component.spec @@ -41,15 +41,13 @@ if [ $? -ne 0 ]; then exit 1 fi -STATIC_DATA_DIR="%{_awipscm_share}/awips2-static" - # Copy the sql that is needed to create the maps database. PATH_TO_DDL="build.edex/opt/db/ddl" PATH_TO_MAPS_DDL="${PATH_TO_DDL}/maps" cp -r %{_baseline_workspace}/${PATH_TO_MAPS_DDL}/* \ ${RPM_BUILD_ROOT}/awips2/database/sqlScripts/share/sql/maps -PATH_TO_STATIC_DDL="${STATIC_DATA_DIR}/maps/db" +PATH_TO_STATIC_DDL="%{_awipscm_share}/awips2-static/maps/db" if [ ! -d ${PATH_TO_STATIC_DDL} ]; then file ${PATH_TO_STATIC_DDL} exit 1 diff --git a/rpms/awips2.core/Installer.ncep-database/component.spec b/rpms/awips2.core/Installer.ncep-database/component.spec index 2c52b0258d..fd994fc0fa 100644 --- a/rpms/awips2.core/Installer.ncep-database/component.spec +++ b/rpms/awips2.core/Installer.ncep-database/component.spec @@ -41,19 +41,19 @@ mkdir -p ${RPM_BUILD_ROOT}/awips2/database %install PATH_TO_DDL="build.edex/opt/db/ddl/ncep" -#PATH_TO_SHP_FILES="awips2-static/db/ddl/ncep" +PATH_TO_SHP_FILES="%{_awipscm_share}/awips2-static/ncep/shapefiles" # Create A Temporary Directory For The SQL Scripts That The Database # RPM Will Need. -mkdir -p ${RPM_BUILD_ROOT}/awips2/database/sqlScripts/share/sql/ncep +mkdir -p ${RPM_BUILD_ROOT}/awips2/database/sqlScripts/share/sql/ncep/shapefiles # Copy the ncep sql scripts into the rpm. cp -r %{_baseline_workspace}/${PATH_TO_DDL}/* \ ${RPM_BUILD_ROOT}/awips2/database/sqlScripts/share/sql/ncep # Copy the ncep shapefiles into the rpm. -#cp -r %{_awipscm_share}/${PATH_TO_SHP_FILES}/* \ -# ${RPM_BUILD_ROOT}/awips2/database/sqlScripts/share/sql/ncep +cp -r ${PATH_TO_SHP_FILES}/* \ + ${RPM_BUILD_ROOT}/awips2/database/sqlScripts/share/sql/ncep/shapefiles # Create our installation log file. touch ${RPM_BUILD_ROOT}/awips2/database/sqlScripts/share/sql/ncep/ncep_sql_install.log diff --git a/rpms/awips2.core/Installer.topo/component.spec b/rpms/awips2.core/Installer.topo/component.spec index 9013c7a6a5..aa4e9cace3 100644 --- a/rpms/awips2.core/Installer.topo/component.spec +++ b/rpms/awips2.core/Installer.topo/component.spec @@ -60,11 +60,7 @@ function copyLegal() rm -f %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar } -TOPO_SRC_DIR="awips2-static/topo/" -if [ ! -d %{_awipscm_share}/${TOPO_SRC_DIR} ]; then - file %{_awipscm_share}/${TOPO_SRC_DIR} - exit 1 -fi +TOPO_SRC_DIR="%{_awipscm_share}/awips2-static/topo/" TOPO_TO_COPY=\ (\ @@ -77,12 +73,12 @@ TOPO_TO_COPY=\ 'staticTopo.h5' \ 'usTopo.dat.gz' \ 'worldTopo.dat.gz' \ + 'gtopo30.h5'\ ) # Some of these not provided in source code repos # #TOPO_TO_COPY=\ #(\ -# 'gtopo30.h5'\ # 'srtm30.h5'\ # 'srtm30_plus.h5'\ # 'defaultTopo.h5' \ @@ -99,7 +95,7 @@ TOPO_TO_COPY=\ for topoFile in ${TOPO_TO_COPY[*]}; do - cp -Pp %{_awipscm_share}/${TOPO_SRC_DIR}/${topoFile} \ + cp -Pp ${TOPO_SRC_DIR}/${topoFile} \ ${RPM_BUILD_ROOT}/awips2/edex/data/hdf5/topo if [ $? -ne 0 ]; then exit 1 diff --git a/rpms/awips2.edex/Installer.edex-shapefiles/component.spec b/rpms/awips2.edex/Installer.edex-shapefiles/component.spec index 0cb9d7408e..c25e2f4fc4 100644 --- a/rpms/awips2.edex/Installer.edex-shapefiles/component.spec +++ b/rpms/awips2.edex/Installer.edex-shapefiles/component.spec @@ -46,20 +46,7 @@ if [ $? -ne 0 ]; then exit 1 fi -AWIPS2_STATIC=%{_awipscm_share}/awips2-static - -# Determine which version of the shapefiles we should use. -COMMON=%{_baseline_workspace}/rpms/common -if [ ! -f ${COMMON}/static.versions/LATEST.maps ]; then - file ${COMMON}/static.versions/LATEST.maps - exit 1 -fi - -LATEST=`cat ${COMMON}/static.versions/LATEST.maps` -if [ $? -ne 0 ]; then - exit 1 -fi -SHAPEFILES=${AWIPS2_STATIC}/maps/${LATEST}/shapefiles +SHAPEFILES=%{_awipscm_share}/awips2-static/maps/shapefiles if [ ! -d ${SHAPEFILES} ]; then file ${SHAPEFILES} exit 1 diff --git a/rpms/awips2.edex/deploy.builder/build.sh b/rpms/awips2.edex/deploy.builder/build.sh index fccb6dbd0b..a068320810 100644 --- a/rpms/awips2.edex/deploy.builder/build.sh +++ b/rpms/awips2.edex/deploy.builder/build.sh @@ -9,7 +9,6 @@ VAR_AWIPSII_BUILD_ROOT="/tmp/awips-component" VAR_AWIPSII_VERSION="" VAR_AWIPSII_RELEASE="" VAR_UFRAME_ECLIPSE="/awips2/eclipse" -VAR_AWIPSCM_SHARE="/awips2/jenkins/buildspace/workspace/awipscm" # ----------------------------------------------------------------------------- if [ "${AWIPSII_TOP_DIR}" = "" ] && @@ -52,10 +51,6 @@ function prepareBuildEnvironment() if [ "${UFRAME_ECLIPSE}" = "" ]; then export UFRAME_ECLIPSE="${VAR_UFRAME_ECLIPSE}" fi - - if [ "${AWIPSCM_SHARE}" = "" ]; then - export AWIPSCM_SHARE="${VAR_AWIPSCM_SHARE}" - fi } function setTargetArchitecture() diff --git a/rpms/awips2.shapefiles/Installer.edex-shapefiles/component.spec b/rpms/awips2.shapefiles/Installer.edex-shapefiles/component.spec index beb6393fe9..a4301f67b8 100644 --- a/rpms/awips2.shapefiles/Installer.edex-shapefiles/component.spec +++ b/rpms/awips2.shapefiles/Installer.edex-shapefiles/component.spec @@ -46,9 +46,7 @@ if [ $? -ne 0 ]; then exit 1 fi -AWIPS2_STATIC=%{_awipscm_share}/awips2-static -# /awips2/jenkins/buildspace/workspace/awipscm/awips2-static/shapefiles/ -SHAPEFILES=${AWIPS2_STATIC}/shapefiles +SHAPEFILES=%{_awipscm_share}/awips2-static/shapefiles/ if [ ! -d ${SHAPEFILES} ]; then file ${SHAPEFILES} exit 1 diff --git a/rpms/awips2.shapefiles/deploy.builder/build.sh b/rpms/awips2.shapefiles/deploy.builder/build.sh index 4d5e958885..9ed61940aa 100644 --- a/rpms/awips2.shapefiles/deploy.builder/build.sh +++ b/rpms/awips2.shapefiles/deploy.builder/build.sh @@ -9,7 +9,6 @@ VAR_AWIPSII_BUILD_ROOT="/tmp/awips-component" VAR_AWIPSII_VERSION="" VAR_AWIPSII_RELEASE="" VAR_UFRAME_ECLIPSE="/awips2/eclipse" -VAR_AWIPSCM_SHARE="/awips2/jenkins/buildspace/workspace/awipscm" # ----------------------------------------------------------------------------- if [ "${AWIPSII_TOP_DIR}" = "" ] && @@ -52,10 +51,6 @@ function prepareBuildEnvironment() if [ "${UFRAME_ECLIPSE}" = "" ]; then export UFRAME_ECLIPSE="${VAR_UFRAME_ECLIPSE}" fi - - if [ "${AWIPSCM_SHARE}" = "" ]; then - export AWIPSCM_SHARE="${VAR_AWIPSCM_SHARE}" - fi } function setTargetArchitecture() diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh index 7ba2118ddc..27b4831048 100644 --- a/rpms/build/x86_64/build.sh +++ b/rpms/build/x86_64/build.sh @@ -116,14 +116,16 @@ if [ "${1}" = "-WA" ]; then WA_rpm_build exit 0 fi - +if [ "${1}" = "-topo" ]; then + buildRPM "awips2-data.hdf5-topo" +fi if [ "${1}" = "-pydev" ]; then #buildRPM "awips2-python" #buildRPM "awips2-python-numpy" #buildRPM "awips2-python-pyparsing" #buildRPM "awips2-python-six" #buildRPM "awips2-python-nose" - #buildRPM "awips2-python-h5py" + buildRPM "awips2-python-h5py" #buildRPM "awips2-pypies" #buildRPM "awips2-python-cycler" @@ -135,7 +137,7 @@ if [ "${1}" = "-pydev" ]; then #buildRPM "awips2-python-scipy" #buildRPM "awips2-python-matplotlib" #buildRPM "awips2-python-basemap" - buildRPM "awips2-python-awips" + #buildRPM "awips2-python-awips" # DONE #buildRPM "awips2-python-pint" @@ -298,10 +300,11 @@ if [ "${1}" = "-httpd" ]; then exit 0 fi if [ "${1}" = "-postgres" ]; then + buildRPM "awips2-pypies" #buildRPM "awips2-postgres" - buildRPM "awips2-edex-upc" - buildRPM "awips2-database" - buildRPM "awips2-database-standalone-configuration" + #buildRPM "awips2-edex-upc" + #buildRPM "awips2-database" + #buildRPM "awips2-database-standalone-configuration" #buildRPM "awips2-maps-database" #buildRPM "awips2-ncep-database" diff --git a/rpms/python.site-packages/deploy.builder/build.sh b/rpms/python.site-packages/deploy.builder/build.sh index b56d392cf4..5c17ceb9e0 100644 --- a/rpms/python.site-packages/deploy.builder/build.sh +++ b/rpms/python.site-packages/deploy.builder/build.sh @@ -6,9 +6,6 @@ export WORKSPACE_DIR=`cd ../../../; pwd;` export RPM_SITE_PACKAGE_LOG_FILE="rpm-build.log" export UFRAME_ECLIPSE="/awips2/eclipse" -export AWIPSCM_SHARE="/awips2/jenkins/buildspace/workspace/awipscm" - -source ${WORKSPACE_DIR}/Installer.rpm/awips2.core/deploy.builder/env.sh if [ "${RPM_TOP_DIR}" = "" ]; then echo "ERROR: You Must Set The RPM_TOP_DIR Environment Variable." diff --git a/rpms/unidata/buildEnvironment.sh b/rpms/unidata/buildEnvironment.sh index 63cc238f6b..87d5d41031 100755 --- a/rpms/unidata/buildEnvironment.sh +++ b/rpms/unidata/buildEnvironment.sh @@ -13,7 +13,7 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace # baseline is... export BASELINE="${JENKINS_WORKSPACE}" export AWIPSII_VERSION="15.1.3" -export AWIPSII_RELEASE="2" +export AWIPSII_RELEASE="3" export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir" @@ -22,7 +22,8 @@ export WORKSPACE="${BUILD_WORKSPACE}/AWIPS2-UPC_build/baseline" export UFRAME_ECLIPSE="/awips2/eclipse" -export AWIPSCM_SHARE="${BUILD_WORKSPACE}/awipscm" +#export AWIPSCM_SHARE="${BUILD_WORKSPACE}/awipscm" +export AWIPSCM_SHARE="/awips2/repo" export AWIPSII_BUILD_ROOT="${BUILD_WORKSPACE}/tmp/${USER}/awips-component" echo "BUILD_DIR = $BUILD_DIR"