Subversion Repositories DevTools

Rev

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

Rev 4740 Rev 5026
Line 2265... Line 2265...
2265
    }
2265
    }
2266
 
2266
 
2267
    Error ("ResolveBinFile: File not found: $file", "Search Path:", @path)
2267
    Error ("ResolveBinFile: File not found: $file", "Search Path:", @path)
2268
        unless ( @done );
2268
        unless ( @done );
2269
 
2269
 
-
 
2270
    if ( $#done > 0 && ! $wildcard )
-
 
2271
    {
2270
    Warning ("ResolveBinFile: Multiple instances of file found. Only first is used", @done)
2272
        Warning ("ResolveBinFile: Multiple instances of file found. Only first is used", @done);
2271
        if ( $#done > 0 && ! $wildcard && !wantarray );
2273
        splice (@done, 1);
-
 
2274
    }
-
 
2275
 
2272
    return wantarray ? @done : $done[0];
2276
    return wantarray ? @done : $done[0];
2273
}
2277
}
2274
 
2278
 
2275
#-------------------------------------------------------------------------------
2279
#-------------------------------------------------------------------------------
2276
# Function        : ResolveLibFile
2280
# Function        : ResolveLibFile
Line 2409... Line 2413...
2409
    }
2413
    }
2410
 
2414
 
2411
    Error ("ResolveLibFile: File not found: $file", "Search Path:", @path)
2415
    Error ("ResolveLibFile: File not found: $file", "Search Path:", @path)
2412
        unless ( @done );
2416
        unless ( @done );
2413
 
2417
 
-
 
2418
    if ( $#done > 0 && ! $wildcard )
-
 
2419
    {
2414
    Warning ("ResolveLibFile: Multiple instances of file found. Only first is used", @done)
2420
        Warning ("ResolveLibFile: Multiple instances of file found. Only first is used", @done);
2415
        if ( $#done > 0 && ! $wildcard && !wantarray );
2421
        splice (@done, 1);
2416
 
2422
    }
2417
    return wantarray ? @done : $done[0];
2423
    return wantarray ? @done : $done[0];
2418
}
2424
}
2419
 
2425
 
2420
 
2426
 
2421
#-------------------------------------------------------------------------------
2427
#-------------------------------------------------------------------------------