projects / packages / firefox.git / blame
| Commit | Line | Data |
|---|---|---|
| 54d6358a JR |
1 | --- xulrunner-10.0/mozilla/xpcom/idl-parser/xpidl/header.py.wiget 2012-02-09 16:26:27.074098583 +0100 |
| 2 | +++ xulrunner-10.0/mozilla/xpcom/idl-parser/xpidl/header.py 2012-02-09 16:28:01.250436455 +0100 | |
| 3 | @@ -477,7 +477,7 @@ if __name__ == '__main__': | |
| 4 | o = OptionParser() | |
| 5 | o.add_option('-I', action='append', dest='incdirs', default=['.'], | |
| 6 | help="Directory to search for imported files") | |
| 7 | - o.add_option('--cachedir', dest='cachedir', default=None, | |
| 8 | + o.add_option('--cachedir', dest='cachedir', default='', | |
| 9 | help="Directory in which to cache lex/parse tables.") | |
| 10 | o.add_option('-o', dest='outfile', default=None, | |
| 11 | help="Output file (default is stdout)") | |
| 12 | @@ -488,7 +488,7 @@ if __name__ == '__main__': | |
| 13 | options, args = o.parse_args() | |
| 14 | file = args[0] if args else None | |
| 15 | ||
| 16 | - if options.cachedir is not None: | |
| 17 | + if options.cachedir != '': | |
| 18 | if not os.path.isdir(options.cachedir): | |
| 19 | os.mkdir(options.cachedir) | |
| 20 | sys.path.append(options.cachedir) | |
| 21 | @@ -498,7 +498,7 @@ if __name__ == '__main__': | |
| 22 | ||
| 23 | # The only thing special about a regen is that there are no input files. | |
| 24 | if options.regen: | |
| 25 | - if options.cachedir is None: | |
| 26 | + if options.cachedir == '': | |
| 27 | print >>sys.stderr, "--regen useless without --cachedir" | |
| 28 | sys.exit(0) | |
| 29 | ||
| 30 | --- xulrunner-10.0/mozilla/xpcom/idl-parser/xpidl/typelib.py.wiget 2012-02-09 16:31:01.826758036 +0100 | |
| 31 | +++ xulrunner-10.0/mozilla/xpcom/idl-parser/xpidl/typelib.py 2012-02-09 16:32:26.473475659 +0100 | |
| 32 | @@ -276,7 +276,7 @@ if __name__ == '__main__': | |
| 33 | o = OptionParser() | |
| 34 | o.add_option('-I', action='append', dest='incdirs', default=['.'], | |
| 35 | help="Directory to search for imported files") | |
| 36 | - o.add_option('--cachedir', dest='cachedir', default=None, | |
| 37 | + o.add_option('--cachedir', dest='cachedir', default='', | |
| 38 | help="Directory in which to cache lex/parse tables.") | |
| 39 | o.add_option('-o', dest='outfile', default=None, | |
| 40 | help="Output file") | |
| 41 | @@ -287,13 +287,13 @@ if __name__ == '__main__': | |
| 42 | options, args = o.parse_args() | |
| 43 | file = args[0] if args else None | |
| 44 | ||
| 45 | - if options.cachedir is not None: | |
| 46 | + if options.cachedir != '': | |
| 47 | if not os.path.isdir(options.cachedir): | |
| 48 | os.mkdir(options.cachedir) | |
| 49 | sys.path.append(options.cachedir) | |
| 50 | ||
| 51 | if options.regen: | |
| 52 | - if options.cachedir is None: | |
| 53 | + if options.cachedir == '': | |
| 54 | print >>sys.stderr, "--regen requires --cachedir" | |
| 55 | sys.exit(1) | |
| 56 |