Subversion Repositories DevTools

Rev

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

Rev 6828 Rev 6831
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
        *)                      echo "Unknown tag: $tag=$val"
103
        *)                      echo "Unknown tag: $tag=$val"
103
    esac
104
    esac
104
done
105
done
105
 
106
 
106
if [ "${DOWNLOAD_PKG}" = "-DownloadPkg" ]; then
107
if [ "${DOWNLOAD_PKG}" = "-DownloadPkg" ]; then
Line 110... Line 111...
110
else
111
else
111
    DOWNLOAD_PKG_VER=`echo ${DOWNLOAD_PKG} | sed "s|.*-||"`    
112
    DOWNLOAD_PKG_VER=`echo ${DOWNLOAD_PKG} | sed "s|.*-||"`    
112
    DOWNLOAD_PKG_NAME=`echo ${DOWNLOAD_PKG} | sed "s|-${DOWNLOAD_PKG_VER}||"`    
113
    DOWNLOAD_PKG_NAME=`echo ${DOWNLOAD_PKG} | sed "s|-${DOWNLOAD_PKG_VER}||"`    
113
fi
114
fi
114
 
115
 
-
 
116
if [ "${IGNORE_PATH_ERR}" != "1" ]; then
-
 
117
    IGNORE_PATH_ERR=0
-
 
118
fi
115
 
119
 
116
#------------------------------------------------------------------------------
120
#------------------------------------------------------------------------------
117
# Dump JATS information for debugging purposes
121
# Dump JATS information for debugging purposes
118
#------------------------------------------------------------------------------
122
#------------------------------------------------------------------------------
119
echo "="
123
echo "="
Line 139... Line 143...
139
echo " PackageIncDir  = ${PKG_INC_DIR}"
143
echo " PackageIncDir  = ${PKG_INC_DIR}"
140
echo " PackageLibDir  = ${PKG_LIB_DIR}"
144
echo " PackageLibDir  = ${PKG_LIB_DIR}"
141
echo " PackagePkgDir  = ${PKG_PKG_DIR}"
145
echo " PackagePkgDir  = ${PKG_PKG_DIR}"
142
echo " CompilerDir    = ${COMPILER_DIR}"
146
echo " CompilerDir    = ${COMPILER_DIR}"
143
echo " PatchDir       = ${PATCHES_DIR}"
147
echo " PatchDir       = ${PATCHES_DIR}"
-
 
148
echo " IgnorePatchErr = ${IGNORE_PATH_ERR}"
144
echo "="
149
echo "="
145
echo
150
echo
146
echo
151
echo
147
 
152
 
148
 
153
 
Line 607... Line 612...
607
                for PATCH in ${PATCHES}; do
612
                for PATCH in ${PATCHES}; do
608
                    if patch -p1 < ${PATCHES_DIR}/${PATCH}; then
613
                    if patch -p1 < ${PATCHES_DIR}/${PATCH}; then
609
                        echo "Applied patch ${PATCH}"
614
                        echo "Applied patch ${PATCH}"
610
                        echo ""
615
                        echo ""
611
                    else
616
                    else
-
 
617
                        if [ "${IGNORE_PATH_ERR}" = "1" ]; then
-
 
618
                            echo "Patch ${PATCH} errors ignored"
-
 
619
                        else 
612
                        echo "Patch ${PATCH} failed"
620
                            echo "Patch ${PATCH} failed"
613
                        exit 1
621
                            exit 1
-
 
622
                        fi
614
                    fi
623
                    fi
615
                done    
624
                done    
616
            fi
625
            fi
617
        fi
626
        fi
618
        
627