From b8abcf8692b6c79a9c3bd32b2b43d445a4c6020a Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Thu, 28 Feb 2013 14:42:20 -0600
Subject: [PATCH] Issue #1638 - update CAVE rpm name generation

Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f

Former-commit-id: 37e9c0cb20a332400b8d10779a2f3516b13065c6 [formerly a9123a2b844cde997e411eff323f4b72dbf268a2] [formerly b8496877ff95d45a9923da07353762312c3a991e] [formerly 37e9c0cb20a332400b8d10779a2f3516b13065c6 [formerly a9123a2b844cde997e411eff323f4b72dbf268a2] [formerly b8496877ff95d45a9923da07353762312c3a991e] [formerly 5eb888fb985ab920c7c921d248b16a29d230d904 [formerly b8496877ff95d45a9923da07353762312c3a991e [formerly 7cf0100415245ae81fa232e398936fe33a2b1bc3]]]]
Former-commit-id: 5eb888fb985ab920c7c921d248b16a29d230d904
Former-commit-id: 6f57b06d526a21893ab47d10baec21fd43ab9d0e [formerly da0d99d22f95e957dcb9265cd81ee7960d985d01] [formerly 16e35fbbb02090042f28676c5c7015864604ab11 [formerly 22acca8f3d512bd9c94cc56f87c63a1aa534de7f]]
Former-commit-id: 8a05919b3352b9c20cdce27168ba0ceb43d51c4c [formerly 3c2210c80d57d155de13403152cff8e506611700]
Former-commit-id: bc668bc828a1d4487292c199ab598d7c70412a31
---
 rpms/awips2.cave/deploy.builder/build.sh | 39 +++++++++++++++++++-----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/rpms/awips2.cave/deploy.builder/build.sh b/rpms/awips2.cave/deploy.builder/build.sh
index 2d2fad1967..68f14eb271 100644
--- a/rpms/awips2.cave/deploy.builder/build.sh
+++ b/rpms/awips2.cave/deploy.builder/build.sh
@@ -183,14 +183,37 @@ function buildFeatureRPMs()
 
    for feature in `cat ${CONST_FEATURES_TXT}`;
    do
-      java -jar ${PROCESS_FEATURE_JAR} \
-         -p \
-         ${CONST_FEATURE_DIR}/${feature} \
-         ${CONST_SETUP_DIR_FULL}
-      RC=$?
-      if [ ${RC} -ne 0 ]; then
-         echo "ERROR: ${PROCESS_FEATURE_JAR} Failed."
-         exit 1
+      echo "feature = ${feature}"
+      if [ "${feature}" = "com.raytheon.uf.common.base.feature" ]; then
+         echo 'export COMPONENT_NAME="awips2-cave-common-base"' > \
+            ${CONST_SETUP_DIR}/feature.setup
+         echo 'export COMPONENT_FEATURE="com.raytheon.uf.common.base.feature"' >> \
+            ${CONST_SETUP_DIR}/feature.setup
+         echo 'export COMPONENT_DESC="awips2-cave-common-base"' >> \
+            ${CONST_SETUP_DIR}/feature.setup
+	 echo 'export DOWNSTREAM_REQUIRES="awips2-cave"' >> \
+	    ${CONST_SETUP_DIR}/feature.setup
+      else
+         if [ "${feature}" = "com.raytheon.uf.viz.common.core.feature" ]; then
+            echo 'export COMPONENT_NAME="awips2-cave-viz-common-core"' > \
+               ${CONST_SETUP_DIR}/feature.setup
+            echo 'export COMPONENT_FEATURE="com.raytheon.uf.viz.common.core.feature"' >> \
+               ${CONST_SETUP_DIR}/feature.setup
+            echo 'export COMPONENT_DESC="awips2-cave-viz-common-core"' >> \
+               ${CONST_SETUP_DIR}/feature.setup
+            echo 'export DOWNSTREAM_REQUIRES="awips2-cave-viz-cots awips2-cave-common-base"' >> \
+               ${CONST_SETUP_DIR}/feature.setup         
+         else
+            java -jar ${PROCESS_FEATURE_JAR} \
+               -p \
+               ${CONST_FEATURE_DIR}/${feature} \
+               ${CONST_SETUP_DIR_FULL}
+            RC=$?
+            if [ ${RC} -ne 0 ]; then
+               echo "ERROR: ${PROCESS_FEATURE_JAR} Failed."
+               exit 1
+            fi
+         fi
       fi
 
       if [ ! -f ${CONST_SETUP_DIR}/feature.setup ]; then