rpmbuild and comps update for 17.1.1-4

rpms/build/common/lookupRPM.sh

@@ -69,18 +69,14 @@ function lookupRPM()
       export RPM_SPECIFICATION="${installer_dir}/numpy"
       return 0
    fi
+   if [ "${1}" = "awips2-python-nose" ]; then
+      export RPM_SPECIFICATION="${installer_dir}/nose"
+      return 0
+   fi
    if [ "${1}" = "awips2-python-jep" ]; then
       export RPM_SPECIFICATION="${installer_dir}/jep"
       return 0
    fi
-   if [ "${1}" = "awips2-python-numexpr" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/numexpr"
-      return 0
-   fi
-   if [ "${1}" = "awips2-python-pupynere" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/pupynere"
-      return 0
-   fi
    if [ "${1}" = "awips2-python-qpid" ]; then
       export RPM_SPECIFICATION="${installer_dir}/qpid-python"
       return 0
@@ -89,10 +85,6 @@ function lookupRPM()
       export RPM_SPECIFICATION="${installer_dir}/scientific"
       return 0
    fi
-   if [ "${1}" = "awips2-python-scipy" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/scipy"
-      return 0
-   fi
    if [ "${1}" = "awips2-python-tables" ]; then
       export RPM_SPECIFICATION="${installer_dir}/tables"
       return 0
@@ -102,11 +94,9 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2-python-shapely" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/shapely/"
+      export RPM_SPECIFICATION="${installer_dir}/shapely"
       return 0
    fi
-
-   # awips2 rpms.
    if [ "${1}" = "awips2-ncep-database" ]; then
       export RPM_SPECIFICATION="${awips2_core_dir}/Installer.ncep-database"
       return 0
@@ -144,7 +134,7 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2" ]; then
-      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.version"
+      export RPM_SPECIFICATION="${awips2_upc_dir}/Installer.awips"
       return 0
    fi
    if [ "${1}" = "awips2-common-base" ]; then
@@ -155,20 +145,23 @@ function lookupRPM()
       export RPM_SPECIFICATION="${awips2_core_dir}/Installer.rehost-support"
       return 0
    fi
-
+   if [ "${1}" = "awips2-tools" ]; then
-   # foss rpms.
+      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.tools"
-   if [ "${1}" = "awips2-qpid-java" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/qpid-java"
       return 0
    fi
-   if [ "${1}" = "awips2-qpid-lib" ]; then
+   # FOSS RPMs
-      export RPM_SPECIFICATION="${installer_dir}/qpid-lib"
+   if [ "${1}" = "awips2-qpid-java-client" ]; then
+      export RPM_SPECIFICATION="${installer_dir}/qpid-java-client"
       return 0
    fi
    if [ "${1}" = "awips2-qpid-java-broker" ]; then
       export RPM_SPECIFICATION="${installer_dir}/qpid-java-broker"
       return 0
    fi
+   if [ "${1}" = "awips2-qpid-lib" ]; then
+      export RPM_SPECIFICATION="${installer_dir}/qpid-lib"
+      return 0
+   fi
    if [ "${1}" = "awips2-ant" ]; then
       export RPM_SPECIFICATION="${installer_dir}/ant"
       return 0
@@ -182,7 +175,7 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2-groovy" ]; then
-      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.groovy"
+      export RPM_SPECIFICATION="${installer_dir}/groovy"
       return 0
    fi
    if [ "${1}" = "awips2-postgresql" ]; then
@@ -193,10 +186,6 @@ function lookupRPM()
       export RPM_SPECIFICATION="${installer_dir}/pgadmin3"
       return 0
    fi
-   if [ "${1}" = "awips2-tools" ]; then
-      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.tools"
-      return 0
-   fi
    if [ "${1}" = "awips2-eclipse" ]; then
       export RPM_SPECIFICATION="${installer_dir}/eclipse"
       return 0
@@ -233,10 +222,6 @@ function lookupRPM()
       export RPM_SPECIFICATION="${awips2_upc_dir}/Installer.ldm"
       return 0
    fi
-   if [ "${1}" = "awips2-edex-upc" ]; then
-      export RPM_SPECIFICATION="${awips2_upc_dir}/Installer.edex-upc"
-      return 0
-   fi
    if [ "${1}" = "awips2-localization" ]; then
       export RPM_SPECIFICATION="${awips2_core_dir}/localization"
       return 0

rpms/build/x86_64/build.sh

@@ -2,7 +2,7 @@
 
 function usage()
 {
-   echo "Usage: $0 OPTION [-nobinlightning]"
+   echo "Usage: $0 OPTION"
    echo "   -b preform a build of an rpm."
    echo "   -WA       perform a build of all work assignments."
    echo "   -rh6      perform a full build of all the rpms."
@@ -75,12 +75,6 @@ if [ $RTN -ne 0 ]; then
    exit 1
 fi
 
-export LIGHTNING=true
-# Determine if the optional '-nobinlightning' argument has been specified.
-if [ "${2}" = "-nobinlightning" ]; then
-   LIGHTNING=false
-fi
-
 if [ "${1}" = "-b" -a -n "${2}" ]; then
    echo "Building RPM: ${2}"
    # also allow buildCAVE, buildEDEX, buildRPM args
@@ -96,39 +90,24 @@ if [ "${1}" = "-b" -a -n "${2}" ]; then
    exit 0
 fi
 
-# 
+# BUILD GROUPS
-# build groups
+
-# 
 function build_qpid() {
-   buildRPM "awips2-python-qpid"
+   buildRPM "awips2-qpid-java-client"
-   buildRPM "awips2-qpid-lib"
-   buildRPM "awips2-qpid-java"
    buildRPM "awips2-qpid-java-broker"
 }
 function build_python() {
-   #noarch
-   buildRPM "awips2-python-pupynere"
-   buildRPM "awips2-python-qpid"
-   buildRPM "awips2-python-werkzeug"
-   #x86_64
-   buildRPM "awips2-python"
-   buildRPM "awips2-python-awips"
-   buildRPM "awips2-python-cython"
-   buildRPM "awips2-python-cycler"
-   buildRPM "awips2-python-dateutil"
-   buildRPM "awips2-python-gfe"
    buildRPM "awips2-python-h5py"
    buildRPM "awips2-python-jep"
-   buildRPM "awips2-python-matplotlib"
-   buildRPM "awips2-python-numexpr"
-   buildRPM "awips2-python-numpy"
-   buildRPM "awips2-python-pyparsing"
-   buildRPM "awips2-python-pytz"
-   buildRPM "awips2-python-scientific"
-   buildRPM "awips2-python-setuptools"
-   buildRPM "awips2-python-shapely"
-   buildRPM "awips2-python-six"
    buildRPM "awips2-python-tables"
+   buildRPM "awips2-python-matplotlib"
+   buildRPM "awips2-python-shapely"
+   buildRPM "awips2-python-scientific"
+   buildRPM "awips2-python-qpid"
+   buildRPM "awips2-python-werkzeug"
+   buildRPM "awips2-python-cycler"
+   buildRPM "awips2-python-gfe"
+   buildRPM "awips2-python-awips"
 }
 function build_database() {
    buildRPM "awips2-database"
@@ -136,43 +115,59 @@ function build_database() {
    buildRPM "awips2-maps-database"
    buildRPM "awips2-ncep-database"
    buildRPM "awips2-edex-shapefiles"
-   buildRPM "awips2-data.hdf5-topo"
+   #buildRPM "awips2-data.hdf5-topo" # too big right now
    buildRPM "awips2-data.gfe"
 }
+function build_pypies() {
+   buildRPM "awips2-pypies"
+   buildRPM "awips2-httpd-pypies"
+}
 function build_server() {
-   # edex components
    buildRPM "awips2"
-   buildRPM "awips2-java"
    buildRPM "awips2-ldm"
    buildRPM "awips2-tools"
-   buildRPM "awips2-httpd-pypies"
+   build_pypies
-   buildRPM "awips2-pypies"
    buildRPM "awips2-cli"
-   buildRPM "awips2-edex-upc"
+   buildRPM "awips2-data.gfe"
    buildLocalization
 }
-function build_dev(){
+function build_ade() {
-   buildRPM "awips2-ant"
+   buildRPM "awips2"
-   buildRPM "awips2-maven"
+   buildRPM "awips2-java"
    buildRPM "awips2-eclipse"
+   buildRPM "awips2-ant"
    buildRPM "awips2-groovy"
+   buildRPM "awips2-yajsw"
+   buildRPM "awips2-python"
+   buildRPM "awips2-python-dateutil"
+   buildRPM "awips2-python-numpy"
+   buildRPM "awips2-python-pyparsing"
+   buildRPM "awips2-python-pytz"
+   buildRPM "awips2-python-setuptools"
+   buildRPM "awips2-python-six"
+   buildRPM "awips2-python-pytz"
+   buildRPM "awips2-qpid-lib"
 }
 
-if [ "${1}" = "-cave" ]; then buildCAVE && exit 0; fi
+if [ "${1}" = "-ade" ]; then build_ade && exit 0; fi
-if [ "${1}" = "-qpid" ]; then build_qpid && exit 0; fi
 if [ "${1}" = "-python" ]; then build_python && exit 0; fi
+if [ "${1}" = "-qpid" ]; then build_qpid && exit 0; fi
+if [ "${1}" = "-server" ]; then build_server && exit 0; fi
+if [ "${1}" = "-pypies" ]; then build_pypies && exit 0; fi
+if [ "${1}" = "-localization" ]; then buildLocalization && exit 0; fi
 if [ "${1}" = "-database" ]; then build_database && exit 0; fi
 if [ "${1}" = "-edex" ]; then buildEDEX && exit 0; fi
-if [ "${1}" = "-server" ]; then build_server && exit 0; fi
+if [ "${1}" = "-cave" ]; then buildCAVE && exit 0; fi
-if [ "${1}" = "-localization" ]; then buildLocalization && exit 0; fi
-if [ "${1}" = "-dev" ]; then build_dev && exit 0; fi
 if [ "${1}" = "-WA" ]; then WA_rpm_build && exit 0; fi
+
+# BUILD ALL PACKAGES
+
 if [ "${1}" = "-all" ]; then
-   build_qpid
+   build_ade
    build_python
+   build_qpid
    build_server
    build_database
-   build_dev
    buildEDEX
    buildCAVE
    exit 0

rpms/unidata/comps.xml

@@ -10,28 +10,22 @@
          <packagereq type="default">awips2-java</packagereq>
          <packagereq type="default">awips2-eclipse</packagereq>
          <packagereq type="default">awips2-ant</packagereq>
-         <packagereq type="default">awips2-maven</packagereq>
          <packagereq type="default">awips2-groovy</packagereq>
+         <packagereq type="default">awips2-yajsw</packagereq>
          <packagereq type="default">awips2-python</packagereq>
-         <packagereq type="default">awips2-python-awips</packagereq>
          <packagereq type="default">awips2-python-cython</packagereq>
          <packagereq type="default">awips2-python-dateutil</packagereq>
-         <packagereq type="default">awips2-python-gfe</packagereq>
-         <packagereq type="default">awips2-python-h5py</packagereq>
-         <packagereq type="default">awips2-python-jep</packagereq>
-         <packagereq type="default">awips2-python-matplotlib</packagereq>
          <packagereq type="default">awips2-python-numpy</packagereq>
-         <packagereq type="default">awips2-python-numexpr</packagereq>
-         <packagereq type="default">awips2-python-pupynere</packagereq>
          <packagereq type="default">awips2-python-pyparsing</packagereq>
          <packagereq type="default">awips2-python-pytz</packagereq>
-         <packagereq type="default">awips2-python-qpid</packagereq>
-         <packagereq type="default">awips2-python-scientific</packagereq>
          <packagereq type="default">awips2-python-setuptools</packagereq>
-         <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
-         <packagereq type="default">awips2-python-tables</packagereq>
+         <packagereq type="default">awips2-qpid-lib</packagereq>
-         <packagereq type="default">awips2-python-werkzeug</packagereq>
+<!--
+awips2.core/Installer.tools/component.spec:BuildRequires: awips2-python
+awips2.core/Installer.tools/component.spec:BuildRequires: awips2-python-h5py # h5py requires it be built on same numpy as it's run with
+awips2.upc/Installer.ldm/component.spec:BuildRequires: awips2-qpid-lib, awips2-python
+-->
       </packagelist>
    </group>
    <group>
@@ -44,7 +38,6 @@
          <packagereq type="default">awips2</packagereq>
          <packagereq type="default">awips2-eclipse</packagereq>
          <packagereq type="default">awips2-ant</packagereq>
-         <packagereq type="default">awips2-maven</packagereq>
          <packagereq type="default">awips2-java</packagereq>
          <packagereq type="default">awips2-groovy</packagereq>
          <packagereq type="default">awips2-postgresql</packagereq>
@@ -52,12 +45,10 @@
          <packagereq type="default">awips2-database</packagereq>
          <packagereq type="default">awips2-httpd-pypies</packagereq>
          <packagereq type="default">awips2-qpid-java-client</packagereq>
-         <packagereq type="default">awips2-qpid-java-common</packagereq>
          <packagereq type="default">awips2-qpid-java-broker</packagereq>
          <packagereq type="default">awips2-qpid-lib</packagereq>
          <packagereq type="default">awips2-localization</packagereq>
          <packagereq type="default">awips2-ldm</packagereq>
-         <packagereq type="default">awips2-edex-upc</packagereq>
          <packagereq type="default">awips2-tools</packagereq>
          <packagereq type="default">awips2-maps-database</packagereq>
          <packagereq type="default">awips2-data.hdf5-topo</packagereq>
@@ -71,8 +62,6 @@
          <packagereq type="default">awips2-python-jep</packagereq>
          <packagereq type="default">awips2-python-matplotlib</packagereq>
          <packagereq type="default">awips2-python-numpy</packagereq>
-         <packagereq type="default">awips2-python-numexpr</packagereq>
-         <packagereq type="default">awips2-python-pupynere</packagereq>
          <packagereq type="default">awips2-python-pyparsing</packagereq>
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-qpid</packagereq>
@@ -97,12 +86,10 @@
          <packagereq type="default">awips2-edex</packagereq>
          <packagereq type="default">awips2-edex-base</packagereq>
          <packagereq type="default">awips2-edex-common-core</packagereq>
-         <packagereq type="default">awips2-edex-configuration</packagereq>
          <packagereq type="default">awips2-edex-core</packagereq>
          <packagereq type="default">awips2-edex-cots</packagereq>
          <packagereq type="default">awips2-edex-dataplugins</packagereq>
          <packagereq type="default">awips2-edex-ncep</packagereq>
-         <packagereq type="default">awips2-edex-upc</packagereq>
          <packagereq type="default">awips2-java</packagereq>
          <packagereq type="default">awips2-ldm</packagereq>
          <packagereq type="default">awips2-python</packagereq>
@@ -114,8 +101,6 @@
          <packagereq type="default">awips2-python-jep</packagereq>
          <packagereq type="default">awips2-python-matplotlib</packagereq>
          <packagereq type="default">awips2-python-numpy</packagereq>
-         <packagereq type="default">awips2-python-numexpr</packagereq>
-         <packagereq type="default">awips2-python-pupynere</packagereq>
          <packagereq type="default">awips2-python-pyparsing</packagereq>
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-qpid</packagereq>
@@ -123,10 +108,10 @@
          <packagereq type="default">awips2-python-setuptools</packagereq>
          <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
+         <packagereq type="default">awips2-python-tables</packagereq>
          <packagereq type="default">awips2-python-werkzeug</packagereq>
          <packagereq type="default">awips2-qpid-java-broker</packagereq>
          <packagereq type="default">awips2-qpid-java-client</packagereq>
-         <packagereq type="default">awips2-qpid-java-common</packagereq>
          <packagereq type="default">awips2-qpid-lib</packagereq>
          <packagereq type="default">awips2-tools</packagereq>
          <packagereq type="default">awips2-yajsw</packagereq>
@@ -148,7 +133,6 @@
          <packagereq type="default">awips2-edex</packagereq>
          <packagereq type="default">awips2-edex-base</packagereq>
          <packagereq type="default">awips2-edex-common-core</packagereq>
-         <packagereq type="default">awips2-edex-configuration</packagereq>
          <packagereq type="default">awips2-edex-core</packagereq>
          <packagereq type="default">awips2-edex-cots</packagereq>
          <packagereq type="default">awips2-edex-dataplugins</packagereq>
@@ -156,7 +140,6 @@
          <packagereq type="default">awips2-gfesuite</packagereq>
          <packagereq type="default">awips2-edex-ncep</packagereq>
          <packagereq type="default">awips2-edex-shapefiles</packagereq>
-         <packagereq type="default">awips2-edex-upc</packagereq>
          <packagereq type="default">awips2-edex-request</packagereq>
          <packagereq type="default">awips2-httpd-pypies</packagereq>
          <packagereq type="default">awips2-java</packagereq>
@@ -174,8 +157,6 @@
          <packagereq type="default">awips2-python-jep</packagereq>
          <packagereq type="default">awips2-python-matplotlib</packagereq>
          <packagereq type="default">awips2-python-numpy</packagereq>
-         <packagereq type="default">awips2-python-numexpr</packagereq>
-         <packagereq type="default">awips2-python-pupynere</packagereq>
          <packagereq type="default">awips2-python-pyparsing</packagereq>
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-qpid</packagereq>
@@ -183,10 +164,10 @@
          <packagereq type="default">awips2-python-setuptools</packagereq>
          <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
+         <packagereq type="default">awips2-python-tables</packagereq>
          <packagereq type="default">awips2-python-werkzeug</packagereq>
          <packagereq type="default">awips2-qpid-java-broker</packagereq>
          <packagereq type="default">awips2-qpid-java-client</packagereq>
-         <packagereq type="default">awips2-qpid-java-common</packagereq>
          <packagereq type="default">awips2-qpid-lib</packagereq>
          <packagereq type="default">awips2-tools</packagereq>
          <packagereq type="default">awips2-localization</packagereq>
@@ -210,7 +191,6 @@
          <packagereq type="default">awips2-edex</packagereq>
          <packagereq type="default">awips2-edex-base</packagereq>
          <packagereq type="default">awips2-edex-common-core</packagereq>
-         <packagereq type="default">awips2-edex-configuration</packagereq>
          <packagereq type="default">awips2-edex-core</packagereq>
          <packagereq type="default">awips2-edex-cots</packagereq>
          <packagereq type="default">awips2-edex-dataplugins</packagereq>
@@ -218,8 +198,8 @@
          <packagereq type="default">awips2-gfesuite</packagereq>
          <packagereq type="default">awips2-edex-ncep</packagereq>
          <packagereq type="default">awips2-edex-shapefiles</packagereq>
-         <packagereq type="default">awips2-edex-upc</packagereq>
          <packagereq type="default">awips2-httpd-pypies</packagereq>
+         <packagereq type="default">awips2-httpd-pypies-tools</packagereq>
          <packagereq type="default">awips2-java</packagereq>
          <packagereq type="default">awips2-ldm</packagereq>
          <packagereq type="default">awips2-maps-database</packagereq>
@@ -236,8 +216,6 @@
          <packagereq type="default">awips2-python-jep</packagereq>
          <packagereq type="default">awips2-python-matplotlib</packagereq>
          <packagereq type="default">awips2-python-numpy</packagereq>
-         <packagereq type="default">awips2-python-numexpr</packagereq>
-         <packagereq type="default">awips2-python-pupynere</packagereq>
          <packagereq type="default">awips2-python-pyparsing</packagereq>
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-qpid</packagereq>
@@ -245,10 +223,10 @@
          <packagereq type="default">awips2-python-setuptools</packagereq>
          <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
+         <packagereq type="default">awips2-python-tables</packagereq>
          <packagereq type="default">awips2-python-werkzeug</packagereq>
          <packagereq type="default">awips2-qpid-java-broker</packagereq>
          <packagereq type="default">awips2-qpid-java-client</packagereq>
-         <packagereq type="default">awips2-qpid-java-common</packagereq>
          <packagereq type="default">awips2-qpid-lib</packagereq>
          <packagereq type="default">awips2-tools</packagereq>
          <packagereq type="default">awips2-localization</packagereq>
@@ -274,8 +252,6 @@
          <packagereq type="default">awips2-python-jep</packagereq>
          <packagereq type="default">awips2-python-matplotlib</packagereq>
          <packagereq type="default">awips2-python-numpy</packagereq>
-         <packagereq type="default">awips2-python-numexpr</packagereq>
-         <packagereq type="default">awips2-python-pupynere</packagereq>
          <packagereq type="default">awips2-python-pyparsing</packagereq>
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-scientific</packagereq>

rpms/unidata/repo.sh

@@ -2,13 +2,14 @@
 source buildEnvironment.sh
 export LD_LIBRARY_PATH=/usr/lib:/lib:/usr/lib64:/lib64
 export RPMDIR=/awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/
+cp comps.xml ${RPMDIR}
 cd ${RPMDIR}
 pwd
-repomanage -k1 --old . | xargs rm -f
+repomanage -k2 --old . | xargs rm -f
 createrepo -g ./comps.xml .
 unset LD_LIBRARY_PATH
-#. /etc/profile.d/awips2.sh
+. /etc/profile.d/awips2.sh
-#rsync --archive --delete $RPMDIR js-17-218.jetstream-cloud.org:/awips2/repo/awips2_17.1.1
+rsync --archive --delete $RPMDIR tomcat@www:/web/content/repos/yum/awips2-dev/
 
 cd ..
 #rm -rf awips2_${AWIPSII_VERSION}.tar