Changeset 1577 for trunk/bin


Ignore:
Timestamp:
06/29/09 13:43:16 (15 years ago)
Author:
Malte Marquarding
Message:

support otool

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/install

    r1232 r1577  
    1818    lddopts = ""
    1919    if (sys.platform == "darwin"):
    20         lddcommand = "otool"
     20        lddcommand = "/usr/bin/otool"
    2121        lddopts = "-L"
    2222    if not os.path.isfile(lddcommand):
     
    2727    resolved = []
    2828    unresolved = []
    29     for l in p.readlines():
    30         lsp = l.split()
    31         # test this to avoid fails on linux_gate, which has no library
    32         if len(lsp) >= 3:
    33             if lsp[2] == "not":
    34                 unresolved.append(lsp[0])
     29    if sys.platform == "linux2":
     30        for l in p.readlines():
     31            lsp = l.split()
     32            # test this to avoid fails on linux_gate, which has no library
     33            if len(lsp) >= 3:
     34                if lsp[2] == "not":
     35                    unresolved.append(lsp[0])
     36                else:
     37                    resolved.append(lsp[2])
     38    elif sys.platform == "darwin":
     39        for l in p.readlines():
     40            l = l.strip()
     41            if l.endswith(":"):
     42                continue
     43            l = l.split()[0]
     44            if not os.path.exists(l):
     45                unresolved.append(l)
    3546            else:
    36                 resolved.append(lsp[2])
     47                resolved.append(l)
    3748    return resolved, unresolved
     49
    3850
    3951try:
     
    122134    print "Installing asap  scripts in %s" % bindir
    123135    if moduledir != sysmoduledir:
    124         import sre
     136        import re
    125137        print "Changing asap startup script to use custom PYTHONPATH"
    126138        inf = file("bin/asap")
Note: See TracChangeset for help on using the changeset viewer.