Issue #1927 - the rpm build will now correctly use the configurable uframe-eclipse location

Change-Id: I2e74909da3f08bf7ef355470786d018df248cb58

Former-commit-id: b71d2cf89c [formerly 47ae8f74c2] [formerly 3ad9637805] [formerly 3ad9637805 [formerly 5844657522]] [formerly b71d2cf89c [formerly 47ae8f74c2] [formerly 3ad9637805] [formerly 3ad9637805 [formerly 5844657522]] [formerly baa6b26c34 [formerly 3ad9637805 [formerly 5844657522] [formerly baa6b26c34 [formerly e9a9ed516bb3f1c9c2b4a768de07c46048de4077]]]]]
Former-commit-id: baa6b26c34
Former-commit-id: b200a4ed6b [formerly f3411d8e51] [formerly 69622150f8] [formerly c8b11cafe745ae9b82c62d1c24d61a3d79d3e9c1 [formerly 9b3f874c72ba86caf08b5f6a50eb61fcaf3a2a06] [formerly 69622150f8 [formerly eafa210750]]]
Former-commit-id: e7c93d4087b6f2e3b35ecce414ca98053e250c02 [formerly 7ef388c8bfc8fbb41c5ecfdea44267bf46a9b4dc] [formerly 8850ac004b [formerly a73af7bdc0]]
Former-commit-id: 8850ac004b
Former-commit-id: 424fd3b9a4

rpms/awips2.cave/setup/scripts/prepare_dist.sh

@@ -73,7 +73,8 @@ fi
 time /awips2/ant/bin/ant -f p2-build.xml \
    -Declipse.dir=${UFRAME_ECLIPSE} \
    -Dbuild.version=${AWIPSII_VERSION} \
-   -Dbuild.arch=${CAVE_BUILD_ARCH}
+   -Dbuild.arch=${CAVE_BUILD_ARCH} \
+   -Declipse.dir=${UFRAME_ECLIPSE}
 RC=$?
 
 if [ ${RC} -ne 0 ]; then

rpms/awips2.core/Installer.common-base/component.spec

@@ -57,7 +57,8 @@ fi
 
 cd ${BUILD_EDEX}
 /awips2/ant/bin/ant -f ${_build_xml} \
-   -Dbuild.arch=${_pde_build_arch} ${_hybrid_target}
+   -Dbuild.arch=${_pde_build_arch} \
+   -Duframe.eclipse=%{_uframe_eclipse} ${_hybrid_target}
 if [ $? -ne 0 ]; then
    exit 1
 fi

rpms/awips2.edex/deploy.builder/build.sh

@@ -136,10 +136,12 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 if [ ${LIGHTNING} = true ]; then
-   /awips2/ant/bin/ant -f build.xml -Dlightning=true
+   /awips2/ant/bin/ant -f build.xml -Dlightning=true \
+      -Duframe.eclipse=${UFRAME_ECLIPSE}
    RC=$?
 else
-   /awips2/ant/bin/ant -f build.xml
+   /awips2/ant/bin/ant -f build.xml \
+      -Duframe.eclipse=${UFRAME_ECLIPSE}
    RC=$?
 fi
 if [ ${RC} -ne 0 ]; then