Changeset 538 for trunk/src


Ignore:
Timestamp:
Sep 19, 2006, 7:01:50 AM (19 years ago)
Author:
bird
Message:

fixed some OBJSUFF and TOOL variable name typos. Drop the expansion checks in the same two function since kbuild_lookup_varaible*() does it.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/gmake/kbuild.c

    r536 r538  
    254254{
    255255    struct variable *pVar;
    256     if (    (pVar = kbuild_lookup_variable_fmt("%_%_%TOOL_.%.%", pTarget, pSource, pType, pBldTrg, pBldTrgArch))
    257         ||  (pVar = kbuild_lookup_variable_fmt("%_%_%TOOL_.%",  pTarget, pSource, pType, pBldTrg))
     256    if (    (pVar = kbuild_lookup_variable_fmt("%_%_%TOOL.%.%", pTarget, pSource, pType, pBldTrg, pBldTrgArch))
     257        ||  (pVar = kbuild_lookup_variable_fmt("%_%_%TOOL.%",  pTarget, pSource, pType, pBldTrg))
    258258        ||  (pVar = kbuild_lookup_variable_fmt("%_%_%TOOL",     pTarget, pSource, pType))
    259         ||  (pVar = kbuild_lookup_variable_fmt("%_%_TOOL_.%.%", pTarget, pSource, pBldTrg, pBldTrgArch))
    260         ||  (pVar = kbuild_lookup_variable_fmt("%_%_TOOL_.%",   pTarget, pSource, pBldTrg))
     259        ||  (pVar = kbuild_lookup_variable_fmt("%_%_TOOL.%.%", pTarget, pSource, pBldTrg, pBldTrgArch))
     260        ||  (pVar = kbuild_lookup_variable_fmt("%_%_TOOL.%",   pTarget, pSource, pBldTrg))
    261261        ||  (pVar = kbuild_lookup_variable_fmt("%_%_TOOL",      pTarget, pSource))
    262         ||  (pVar = kbuild_lookup_variable_fmt("%_%TOOL_.%.%",  pSource, pType, pBldTrg, pBldTrgArch))
    263         ||  (pVar = kbuild_lookup_variable_fmt("%_%TOOL_.%",    pSource, pType, pBldTrg))
     262        ||  (pVar = kbuild_lookup_variable_fmt("%_%TOOL.%.%",  pSource, pType, pBldTrg, pBldTrgArch))
     263        ||  (pVar = kbuild_lookup_variable_fmt("%_%TOOL.%",    pSource, pType, pBldTrg))
    264264        ||  (pVar = kbuild_lookup_variable_fmt("%_%TOOL",       pSource, pType))
    265         ||  (pVar = kbuild_lookup_variable_fmt("%_TOOL_.%.%",   pSource, pBldTrg, pBldTrgArch))
    266         ||  (pVar = kbuild_lookup_variable_fmt("%_TOOL_.%",     pSource, pBldTrg))
     265        ||  (pVar = kbuild_lookup_variable_fmt("%_TOOL.%.%",   pSource, pBldTrg, pBldTrgArch))
     266        ||  (pVar = kbuild_lookup_variable_fmt("%_TOOL.%",     pSource, pBldTrg))
    267267        ||  (pVar = kbuild_lookup_variable_fmt("%_TOOL",        pSource))
    268         ||  (pVar = kbuild_lookup_variable_fmt("%_%TOOL_.%.%",  pTarget, pType, pBldTrg, pBldTrgArch))
    269         ||  (pVar = kbuild_lookup_variable_fmt("%_%TOOL_.%",    pTarget, pType, pBldTrg))
     268        ||  (pVar = kbuild_lookup_variable_fmt("%_%TOOL.%.%",  pTarget, pType, pBldTrg, pBldTrgArch))
     269        ||  (pVar = kbuild_lookup_variable_fmt("%_%TOOL.%",    pTarget, pType, pBldTrg))
    270270        ||  (pVar = kbuild_lookup_variable_fmt("%_%TOOL",       pTarget, pType))
    271         ||  (pVar = kbuild_lookup_variable_fmt("%_TOOL_.%.%",   pTarget, pBldTrg, pBldTrgArch))
    272         ||  (pVar = kbuild_lookup_variable_fmt("%_TOOL_.%",     pTarget, pBldTrg))
     271        ||  (pVar = kbuild_lookup_variable_fmt("%_TOOL.%.%",   pTarget, pBldTrg, pBldTrgArch))
     272        ||  (pVar = kbuild_lookup_variable_fmt("%_TOOL.%",     pTarget, pBldTrg))
    273273        ||  (pVar = kbuild_lookup_variable_fmt("%_TOOL",        pTarget))
    274         ||  (pVar = kbuild_lookup_variable_fmt("%TOOL_.%.%",    pType, pBldTrg, pBldTrgArch))
    275         ||  (pVar = kbuild_lookup_variable_fmt("%TOOL_.%",      pType, pBldTrg))
     274        ||  (pVar = kbuild_lookup_variable_fmt("%TOOL.%.%",    pType, pBldTrg, pBldTrgArch))
     275        ||  (pVar = kbuild_lookup_variable_fmt("%TOOL.%",      pType, pBldTrg))
    276276        ||  (pVar = kbuild_lookup_variable_fmt("%TOOL",         pType))
    277         ||  (pVar = kbuild_lookup_variable_fmt("TOOL_.%.%",     pBldTrg, pBldTrgArch))
    278         ||  (pVar = kbuild_lookup_variable_fmt("TOOL_.%",       pBldTrg))
     277        ||  (pVar = kbuild_lookup_variable_fmt("TOOL.%.%",     pBldTrg, pBldTrgArch))
     278        ||  (pVar = kbuild_lookup_variable_fmt("TOOL.%",       pBldTrg))
    279279        ||  (pVar = kbuild_lookup_variable("TOOL"))
    280280       )
    … …  
    291291            char chSaved = *pszEnd;
    292292            *pszEnd = '\0';
    293             if (!strchr(pszEnd, '$'))
    294                 pVar = define_variable_vl(pszVarName, strlen(pszVarName), psz, pszEnd - psz,
    295                                           1 /* duplicate */, o_file, 0 /* !recursive */);
    296             else
    297             {
    298                 /* needs expanding and stripping. */
    299                 char *pszFree;
    300                 char *pszExp = pszFree = allocated_variable_expand(psz);
    301                 char *pszExpEnd = strchr(pszExp, '\0');
    302                 while (isblank((unsigned char)*pszExp))
    303                     pszExp++;
    304                 while (pszExpEnd > pszExp && isblank((unsigned char)pszExpEnd[-1]))
    305                     pszExpEnd--;
    306                 if (pszExpEnd > pszExp)
    307                 {
    308                     *pszExpEnd = '\0';
    309                     pVar = define_variable_vl(pszVarName, strlen(pszVarName), pszExp,
    310                                               pszExpEnd - pszExp, 1 /* duplicate */,
    311                                               o_file, 0 /* !recursive */);
    312                 }
    313                 else
    314                     pVar = NULL;
    315                 free(pszFree);
    316             }
     293            pVar = define_variable_vl(pszVarName, strlen(pszVarName), psz, pszEnd - psz,
     294                                      1 /* duplicate */, o_file, 0 /* !recursive */);
    317295            *pszEnd = chSaved;
    318296            if (pVar)
    … …  
    480458    /** @todo ignore variables without content. Can generalize this and join with the tool getter. */
    481459    struct variable *pVar;
    482     if (    (pVar = kbuild_lookup_variable_fmt("%_%_OBJSUFF_.%.%", pTarget, pSource, pBldTrg, pBldTrgArch))
    483         ||  (pVar = kbuild_lookup_variable_fmt("%_%_OBJSUFF_.%",   pTarget, pSource, pBldTrg))
     460    if (    (pVar = kbuild_lookup_variable_fmt("%_%_OBJSUFF.%.%", pTarget, pSource, pBldTrg, pBldTrgArch))
     461        ||  (pVar = kbuild_lookup_variable_fmt("%_%_OBJSUFF.%",   pTarget, pSource, pBldTrg))
    484462        ||  (pVar = kbuild_lookup_variable_fmt("%_%_OBJSUFF",      pTarget, pSource))
    485         ||  (pVar = kbuild_lookup_variable_fmt("%_OBJSUFF_.%.%",   pSource, pBldTrg, pBldTrgArch))
    486         ||  (pVar = kbuild_lookup_variable_fmt("%_OBJSUFF_.%",     pSource, pBldTrg))
     463        ||  (pVar = kbuild_lookup_variable_fmt("%_OBJSUFF.%.%",   pSource, pBldTrg, pBldTrgArch))
     464        ||  (pVar = kbuild_lookup_variable_fmt("%_OBJSUFF.%",     pSource, pBldTrg))
    487465        ||  (pVar = kbuild_lookup_variable_fmt("%_OBJSUFF",        pSource))
    488         ||  (pVar = kbuild_lookup_variable_fmt("%_OBJSUFF_.%.%",   pTarget, pBldTrg, pBldTrgArch))
    489         ||  (pVar = kbuild_lookup_variable_fmt("%_OBJSUFF_.%",     pTarget, pBldTrg))
     466        ||  (pVar = kbuild_lookup_variable_fmt("%_OBJSUFF.%.%",   pTarget, pBldTrg, pBldTrgArch))
     467        ||  (pVar = kbuild_lookup_variable_fmt("%_OBJSUFF.%",     pTarget, pBldTrg))
    490468        ||  (pVar = kbuild_lookup_variable_fmt("%_OBJSUFF",        pTarget))
    491469        ||  (pVar = kbuild_lookup_variable_fmt("OBJSUFF.%.%",      pBldTrg, pBldTrgArch))
    … …  
    505483            char chSaved = *pszEnd;
    506484            *pszEnd = '\0';
    507             if (!strchr(pszEnd, '$'))
    508                 pVar = define_variable_vl(pszVarName, strlen(pszVarName), psz, pszEnd - psz,
    509                                           1 /* duplicate */, o_file, 0 /* !recursive */);
    510             else
    511             {
    512                 /* needs expanding and stripping. */
    513                 char *pszFree;
    514                 char *pszExp = pszFree = allocated_variable_expand(psz);
    515                 char *pszExpEnd = strchr(pszExp, '\0');
    516                 while (isblank((unsigned char)*pszExp))
    517                     pszExp++;
    518                 while (pszExpEnd > pszExp && isblank((unsigned char)pszExpEnd[-1]))
    519                     pszExpEnd--;
    520                 if (pszExpEnd > pszExp)
    521                 {
    522                     *pszExpEnd = '\0';
    523                     pVar = define_variable_vl(pszVarName, strlen(pszVarName), pszExp,
    524                                               pszExpEnd - pszExp, 1 /* duplicate */,
    525                                               o_file, 0 /* !recursive */);
    526                 }
    527                 else
    528                     pVar = NULL;
    529                 free(pszFree);
    530             }
     485            pVar = define_variable_vl(pszVarName, strlen(pszVarName), psz, pszEnd - psz,
     486                                      1 /* duplicate */, o_file, 0 /* !recursive */);
    531487            *pszEnd = chSaved;
    532488            if (pVar)
Note: See TracChangeset for help on using the changeset viewer.