Show More
@@ -795,8 +795,8 b' class hgbuilddoc(Command):' | |||||
795 | normalizecrlf('doc/%s.html' % root) |
|
795 | normalizecrlf('doc/%s.html' % root) | |
796 |
|
796 | |||
797 | # This logic is duplicated in doc/Makefile. |
|
797 | # This logic is duplicated in doc/Makefile. | |
798 |
sources = |
|
798 | sources = set(f for f in os.listdir('mercurial/help') | |
799 |
if re.search(r'[0-9]\.txt$', f) |
|
799 | if re.search(r'[0-9]\.txt$', f)) | |
800 |
|
800 | |||
801 | # common.txt is a one-off. |
|
801 | # common.txt is a one-off. | |
802 | gentxt('common') |
|
802 | gentxt('common') | |
@@ -971,9 +971,12 b' if py2exehacked:' | |||||
971 | res = buildpy2exe.find_needed_modules(self, mf, files, modules) |
|
971 | res = buildpy2exe.find_needed_modules(self, mf, files, modules) | |
972 |
|
972 | |||
973 | # Replace virtualenv's distutils modules with the real ones. |
|
973 | # Replace virtualenv's distutils modules with the real ones. | |
974 |
|
|
974 | modules = {} | |
975 |
|
|
975 | for k, v in res.modules.items(): | |
976 |
if k != 'distutils' and not k.startswith('distutils.') |
|
976 | if k != 'distutils' and not k.startswith('distutils.'): | |
|
977 | modules[k] = v | |||
|
978 | ||||
|
979 | res.modules = modules | |||
977 |
|
980 | |||
978 | import opcode |
|
981 | import opcode | |
979 | distutilsreal = os.path.join(os.path.dirname(opcode.__file__), |
|
982 | distutilsreal = os.path.join(os.path.dirname(opcode.__file__), |
General Comments 0
You need to be logged in to leave comments.
Login now