Changeset af5db72 in rtems-libbsd


Ignore:
Timestamp:
Mar 9, 2012, 8:43:41 PM (8 years ago)
Author:
Jennifer Averett <jennifer.averett@…>
Branches:
4.11, c1e05b9ea378b2971e3d7704779112b4bc4296da, freebsd-9.3, 4a77611a223ea883fb548679b516d326a020d447
Children:
3939378
Parents:
9e3ba38
Message:

Use partial path to avoid seeing rtems in full path

File:
1 edited

Legend:

Unmodified
Added
Removed
  • freebsd-to-rtems.py

    r9e3ba38 raf5db72  
    5858  print "  -m|--makefile    just generate Makefile"
    5959  print "  -R|--reverse     default FreeBSD -> RTEMS, reverse that"
    60   print "  -r|--rtems       RTEMS directory"
    61   print "  -f|--freebsd     FreeBSD directory"
     60  print "  -r|--rtems       RTEMS Libbsd directory"
     61  print "  -f|--freebsd     FreeBSD SVN directory"
    6262  print "  -v|--verbose     enable verbose output mode"
    6363
     
    111111print "Dry Run:                " + ("no", "yes")[isDryRun]
    112112print "Only Generate Makefile: " + ("no", "yes")[isOnlyMakefile]
    113 print "RTEMS Directory:        " + RTEMS_DIR
    114 print "FreeBSD Directory:      " + FreeBSD_DIR
     113print "RTEMS Libbsd Directory: " + RTEMS_DIR
     114print "FreeBSD SVN Directory:  " + FreeBSD_DIR
    115115print "Direction:              " + ("reverse", "forward")[isForward]
    116116
     
    206206        global tempFile
    207207        src = FreeBSD_DIR + '/' + org
    208         dst = RTEMS_DIR + '/' + PREFIX + '/' + org # + org.replace('rtems/', '')
     208        dst = RTEMS_DIR + '/' + PREFIX + '/' + org
    209209        dst = mapContribPath(dst)
    210210        if target != "generic":
     
    220220        data = open(src).read()
    221221        out = open(tempFile, 'w')
    222         if src.find('rtems') == -1:
     222        if org.find('rtems') == -1:
    223223                data = fixIncludes(data)
    224224        out.write(data)
     
    245245        data = open(src).read()
    246246        out = open(tempFile, 'w')
    247         if src.find('rtems') == -1:
     247        if org.find('rtems') == -1:
    248248                data = fixIncludes(data)
    249249                out.write('#include <' + PREFIX + '/machine/rtems-bsd-config.h>\n\n')
Note: See TracChangeset for help on using the changeset viewer.