Show More
@@ -610,7 +610,7 b' class buildhgexe(build_ext):' | |||
|
610 | 610 | |
|
611 | 611 | if filelen > 0 and filelen != size: |
|
612 | 612 | dllbasename = os.path.basename(buf.value) |
|
613 | if not dllbasename.lower().endswith('.dll'): | |
|
613 | if not dllbasename.lower().endswith(b'.dll'): | |
|
614 | 614 | raise SystemExit('Python DLL does not end with .dll: %s' % |
|
615 | 615 | dllbasename) |
|
616 | 616 | pythonlib = dllbasename[:-4] |
@@ -623,8 +623,8 b' class buildhgexe(build_ext):' | |||
|
623 | 623 | |
|
624 | 624 | log.info('using %s as Python library name' % pythonlib) |
|
625 | 625 | with open('mercurial/hgpythonlib.h', 'wb') as f: |
|
626 | f.write('/* this file is autogenerated by setup.py */\n') | |
|
627 | f.write('#define HGPYTHONLIB "%s"\n' % pythonlib) | |
|
626 | f.write(b'/* this file is autogenerated by setup.py */\n') | |
|
627 | f.write(b'#define HGPYTHONLIB "%s"\n' % pythonlib) | |
|
628 | 628 | objects = self.compiler.compile(['mercurial/exewrapper.c'], |
|
629 | 629 | output_dir=self.build_temp) |
|
630 | 630 | dir = os.path.dirname(self.get_ext_fullpath('dummy')) |
@@ -1000,7 +1000,7 b' if py2exeloaded:' | |||
|
1000 | 1000 | if os.name == 'nt': |
|
1001 | 1001 | # Windows binary file versions for exe/dll files must have the |
|
1002 | 1002 | # form W.X.Y.Z, where W,X,Y,Z are numbers in the range 0..65535 |
|
1003 | setupversion = version.split('+', 1)[0] | |
|
1003 | setupversion = version.split(b'+', 1)[0] | |
|
1004 | 1004 | |
|
1005 | 1005 | if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'): |
|
1006 | 1006 | version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[1].splitlines() |
General Comments 0
You need to be logged in to leave comments.
Login now