Subversion Repositories DevTools

Rev

Rev 1497 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1497 Rev 3848
Line 260... Line 260...
260 
                if [ -e ${TMP} ]; then
 260 
                if [ -e ${TMP} ]; then
261 
                    TARBALL_FILE=${TMP}
 261 
                    TARBALL_FILE=${TMP}
262 
                    SHARE_SRC_DIR=${DDIR}/src
 262 
                    SHARE_SRC_DIR=${DDIR}/src
263 
                    SHARE_BASE_DIR=${DDIR}
 263 
                    SHARE_BASE_DIR=${DDIR}
264 
                    TAR_DECOMP_ARG=z
 264 
                    TAR_DECOMP_ARG=z
- 
 
 265 
                else
- 
 
 266 
                    TMP=${DDIR}/downloads/${DOWNLOAD_PKG}.zip
- 
 
 267 
                    if [ -e ${TMP} ]; then
- 
 
 268 
                        TARBALL_FILE=${TMP}
- 
 
 269 
                        SHARE_SRC_DIR=${DDIR}/src
- 
 
 270 
                        SHARE_BASE_DIR=${DDIR}
- 
 
 271 
                        TAR_DECOMP_ARG=unzip
- 
 
 272 
                    fi
265 
                fi
 273 
                fi
266 
            fi
 274 
            fi
267 
        fi
275 
        fi
268 
    done
 276 
    done
269 
    if [ "${SHARE_BASE_DIR}" == "${DDIR_ELSEWHERE}" ]; then
 277 
    if [ "${SHARE_BASE_DIR}" == "${DDIR_ELSEWHERE}" ]; then
270 
        REL_BASE_DIR=../$(echo ${SHELL_BUILD} | sed "s|/src/.*||")
 278 
        REL_BASE_DIR=../$(echo ${SHELL_BUILD} | sed "s|/src/.*||")
271 
    fi
 279 
    fi
272 
    if [ "${TAR_DECOMP_ARG}" == "" ]; then
 280 
    if [ "${TAR_DECOMP_ARG}" == "" ]; then
273 
        echo "Could not find download file ${DOWNLOAD_PKG}.<tar.gz|tar.bz2|tgz> in any of { ${DOWNLOAD_DIRS} }"
 281 
        echo "Could not find download file ${DOWNLOAD_PKG}.<tar.gz|tar.bz2|tgz|zip> in any of { ${DOWNLOAD_DIRS} }"
274 
        exit 1
 282 
        exit 1
275 
    fi
 283 
    fi
276 
    UNTAR_DIR=${LCL_SRC_DIR}/${DOWNLOAD_PKG}
 284 
    UNTAR_DIR=${LCL_SRC_DIR}/${DOWNLOAD_PKG}
277 
    WORK_DIR=${UNTAR_DIR}.${PLATFORM}${TYPE}
 285 
    WORK_DIR=${UNTAR_DIR}.${PLATFORM}${TYPE}
278 
else
 286 
else
Line 481... Line 489...
481 
        rm -fr ${UNTAR_DIR}
 489 
        rm -fr ${UNTAR_DIR}
482 
        rm -fr ${WORK_DIR}
 490 
        rm -fr ${WORK_DIR}
483
491
484 
        echo " --> Extracting ${DOWNLOAD_PKG}"
 492 
        echo " --> Extracting ${DOWNLOAD_PKG}"
485 
        cd ${LCL_SRC_DIR}
 493 
        cd ${LCL_SRC_DIR}
- 
 
 494 
        # For Zip file use unzip instead of tar
- 
 
 495 
        if [ "${TAR_DECOMP_ARG}" == "unzip" ]; then
- 
 
 496 
            unzip ${TARBALL_FILE}
- 
 
 497 
        else
486 
        tar -x${TAR_DECOMP_ARG}pf ${TARBALL_FILE}
 498 
            tar -x${TAR_DECOMP_ARG}pf ${TARBALL_FILE}
- 
 
 499 
        fi
487
500
488 
        cd ${UNTAR_DIR}
 501 
        cd ${UNTAR_DIR}
489 
        PATCHES_DIR=${SHARE_BASE_DIR}/patches
 502 
        PATCHES_DIR=${SHARE_BASE_DIR}/patches
490 
        if [ -d ${PATCHES_DIR} ]; then
 503 
        if [ -d ${PATCHES_DIR} ]; then
491 
            PATCHES=`cd ${PATCHES_DIR} && find . -name "*.patch" | sort`
 504 
            PATCHES=`cd ${PATCHES_DIR} && find . -name "*.patch" | sort`