Issue #1927 - the rpm build will now correctly use the configurable uframe-eclipse location
Change-Id: I2e74909da3f08bf7ef355470786d018df248cb58 Former-commit-id: e9a9ed516bb3f1c9c2b4a768de07c46048de4077
This commit is contained in:
parent
ef69a8dbca
commit
5844657522
3 changed files with 8 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue