Ignore:
Timestamp:
Dec 4, 2012, 1:59:02 PM (6 years ago)
Author:
cameron
Message:

More path fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icXML/icXML-devel/scripts/fix_icxml_imports.py

    r2727 r2733  
    2626        return overrides
    2727
    28 xercesc_include_RE = re.compile("#include <xercesc/([^>]*)>")
     28xercesc_include_RE = re.compile(r"(#\s*include\s+)<xercesc/([^>]*)>")
    2929
    30 xercesc_makefile_RE = re.compile("(\s)xercesc/([^\s]*)(\s)")
     30xercesc_makefile_RE = re.compile("(\\s)xercesc/([^\\s]*)(\\s)")
    3131
    3232
    3333def fix1_path_in_source(matchobj):
    34         if matchobj.group(1) in override_set:
    35           return "#include <%s/%s>" % (icxml_override_dir, matchobj.group(1))
     34        if matchobj.group(2) in override_set:
     35          return "%s<%s/%s>" % (matchobj.group(1), icxml_override_dir, matchobj.group(2))
    3636        else: return matchobj.group(0)
    3737
     
    5151        return s
    5252
    53 makefile = re.compile("Makefile.am|Makefile.in|Makefile$")
     53makefile = re.compile("Makefile.am$|Makefile.in$|Makefile$")
    5454
    5555def fix_file(path):
Note: See TracChangeset for help on using the changeset viewer.