--- elwix/build_3thparty.sh 2014/01/05 23:14:22 1.4 +++ elwix/build_3thparty.sh 2014/01/07 09:27:55 1.4.2.3 @@ -5,10 +5,19 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: build_3thparty.sh,v 1.4 2014/01/05 23:14:22 misho Exp $ +# $Id: build_3thparty.sh,v 1.4.2.3 2014/01/07 09:27:55 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix +if [ -r ./config/rc.3thparty_helper ]; then + . ./config/rc.3thparty_helper +else + echo + echo "ELWIX project is not configured - Missing rc.3thparty_helper script" + echo + exit 1 +fi + if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then echo echo "ELWIX project is not configured !?!" @@ -62,8 +71,9 @@ compile_3th() { echo "+++ Compile ELWIX 3th party ..." - cd $CROSS_3TH - ./build.sh expat ${CBUILD} ${PKG} ${TARGET_BUILD} + BUILD_SH="./config/rc.3thparty_helper" + + ${BUILD_SH} expat ${CBUILD} ${PKG} ${TARGET_BUILD} [ $? -ne 0 ] && exit 1 ./build.sh libevent ${CBUILD} ${PKG} ${TARGET_BUILD} [ $? -ne 0 ] && exit 1 @@ -77,8 +87,8 @@ compile_3th() [ $? -ne 0 ] && exit 1 ./build.sh scan_ffs ${CBUILD} ${PKG} ${TARGET_BUILD} [ $? -ne 0 ] && exit 1 - ./build.sh istgt ${CBUILD} ${PKG} ${TARGET_BUILD} - [ $? -ne 0 ] && exit 1 +# ./build.sh istgt ${CBUILD} ${PKG} ${TARGET_BUILD} +# [ $? -ne 0 ] && exit 1 ./build.sh rsync ${CBUILD} ${PKG} ${TARGET_BUILD} [ $? -ne 0 ] && exit 1 ./build.sh ttcp ${CBUILD} ${PKG} ${TARGET_BUILD} @@ -131,7 +141,6 @@ compile_3th() [ $? -ne 0 ] && exit 1 ./build.sh php ${CBUILD} ${PKG} ${TARGET_BUILD} [ $? -ne 0 ] && exit 1 - cd - } install_3th()