Subversion Repositories DevTools

Rev

Rev 6112 | Rev 6152 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6112 Rev 6114
Line 97... Line 97...
97 
        -ApplyMods)             APPLY_MODS=1;;
 97 
        -ApplyMods)             APPLY_MODS=1;;
98 
        -ConfigVarient)         CONFIG_VARIENT=$val;;
 98 
        -ConfigVarient)         CONFIG_VARIENT=$val;;
99 
        -WorkDir)               WORK_DIR_NAME=$val;;
 99 
        -WorkDir)               WORK_DIR_NAME=$val;;
100 
        -WorkDirSuffix)         WORK_DIR_SUFFIX=$val;;
 100 
        -WorkDirSuffix)         WORK_DIR_SUFFIX=$val;;
101 
        -PatchDir)              PATCHES_DIR=$val;;
 101 
        -PatchDir)              PATCHES_DIR=$val;;
- 
 
 102 
        -IgnorePatchErr)        IGNORE_PATH_ERR=$val;;
102 
        -Toolset)               ISA_TOOLSET=1;;
 103 
        -Toolset)               ISA_TOOLSET=1;;
- 
 
 104 
 
103 
        *)                      echo "Unknown tag: $tag=$val"
 105 
        *)                      echo "Unknown tag: $tag=$val"
104 
    esac
 106 
    esac
105 
done
 107 
done
106 
 
 108 
 
107 
if [ "${DOWNLOAD_PKG}" = "-DownloadPkg" ]; then
 109 
if [ "${DOWNLOAD_PKG}" = "-DownloadPkg" ]; then
Line 111... Line 113...
111 
else
 113 
else
112 
    DOWNLOAD_PKG_VER=`echo ${DOWNLOAD_PKG} | sed "s|.*-||"`
114 
    DOWNLOAD_PKG_VER=`echo ${DOWNLOAD_PKG} | sed "s|.*-||"`
113 
    DOWNLOAD_PKG_NAME=`echo ${DOWNLOAD_PKG} | sed "s|-${DOWNLOAD_PKG_VER}||"`
115 
    DOWNLOAD_PKG_NAME=`echo ${DOWNLOAD_PKG} | sed "s|-${DOWNLOAD_PKG_VER}||"`
114 
fi
 116 
fi
115 
 
 117 
 
- 
 
 118 
if [ "${IGNORE_PATH_ERR}" != "1" ]; then
- 
 
 119 
    IGNORE_PATH_ERR=0
- 
 
 120 
fi
116 
 
 121 
 
117 
#------------------------------------------------------------------------------
 122 
#------------------------------------------------------------------------------
118 
# Dump JATS information for debugging purposes
 123 
# Dump JATS information for debugging purposes
119 
#------------------------------------------------------------------------------
 124 
#------------------------------------------------------------------------------
120 
echo "="
 125 
echo "="
Line 623... Line 628...
623 
                for PATCH in ${PATCHES}; do
 628 
                for PATCH in ${PATCHES}; do
624 
                    if patch -p1 < ${PATCHES_DIR}/${PATCH}; then
 629 
                    if patch -p1 < ${PATCHES_DIR}/${PATCH}; then
625 
                        echo "Applied patch ${PATCH}"
 630 
                        echo "Applied patch ${PATCH}"
626 
                        echo ""
 631 
                        echo ""
627 
                    else
 632 
                    else
- 
 
 633 
                        if [ "${IGNORE_PATH_ERR}" = "1" ]; then
- 
 
 634 
                            echo "Patch ${PATCH} errors ignored"
- 
 
 635 
                        else
628 
                        echo "Patch ${PATCH} failed"
 636 
                            echo "Patch ${PATCH} failed"
629 
                        exit 1
 637 
                            exit 1
- 
 
 638 
                        fi
630 
                    fi
 639 
                    fi
631 
                done
640 
                done
632 
            fi
 641 
            fi
633 
        fi
 642 
        fi
634
643