##// END OF EJS Templates
Applied coding style to setup.py
Thomas Arendsen Hein -
r3238:3dba9ec8 default
parent child Browse files
Show More
@@ -55,9 +55,9 b' try:'
55 self.includes = []
55 self.includes = []
56 else:
56 else:
57 self.includes = self.includes.split(',')
57 self.includes = self.includes.split(',')
58 mercurial.packagescan.scan(self.build_lib,'mercurial')
58 mercurial.packagescan.scan(self.build_lib, 'mercurial')
59 mercurial.packagescan.scan(self.build_lib,'mercurial.hgweb')
59 mercurial.packagescan.scan(self.build_lib, 'mercurial.hgweb')
60 mercurial.packagescan.scan(self.build_lib,'hgext')
60 mercurial.packagescan.scan(self.build_lib, 'hgext')
61 self.includes += mercurial.packagescan.getmodules()
61 self.includes += mercurial.packagescan.getmodules()
62 build_exe.finalize_options(self)
62 build_exe.finalize_options(self)
63 except ImportError:
63 except ImportError:
@@ -79,26 +79,28 b' py2exe_opts = {}'
79 if py2exe_for_demandload is not None:
79 if py2exe_for_demandload is not None:
80 cmdclass['py2exe'] = py2exe_for_demandload
80 cmdclass['py2exe'] = py2exe_for_demandload
81 py2exe_opts['console'] = ['hg']
81 py2exe_opts['console'] = ['hg']
82
82 setup(name='mercurial',
83 setup(name='mercurial',
83 version=mercurial.version.get_version(),
84 version=mercurial.version.get_version(),
84 author='Matt Mackall',
85 author='Matt Mackall',
85 author_email='mpm@selenic.com',
86 author_email='mpm@selenic.com',
86 url='http://selenic.com/mercurial',
87 url='http://selenic.com/mercurial',
87 description='Scalable distributed SCM',
88 description='Scalable distributed SCM',
88 license='GNU GPL',
89 license='GNU GPL',
89 packages=['mercurial', 'mercurial.hgweb', 'hgext'],
90 packages=['mercurial', 'mercurial.hgweb', 'hgext'],
90 ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c']),
91 ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c']),
91 Extension('mercurial.bdiff', ['mercurial/bdiff.c'])],
92 Extension('mercurial.bdiff', ['mercurial/bdiff.c'])],
92 data_files=[('mercurial/templates',
93 data_files=[
93 ['templates/map'] +
94 ('mercurial/templates',
94 glob.glob('templates/map-*') +
95 ['templates/map'] +
95 glob.glob('templates/*.tmpl')),
96 glob.glob('templates/map-*') +
96 ('mercurial/templates/static',
97 glob.glob('templates/*.tmpl')),
97 glob.glob('templates/static/*'))],
98 ('mercurial/templates/static', glob.glob('templates/static/*')),
98 cmdclass=cmdclass,
99 ],
99 scripts=['hg', 'hgmerge'],
100 cmdclass=cmdclass,
100 options=dict(bdist_mpkg=dict(zipdist=True,
101 scripts=['hg', 'hgmerge'],
101 license='COPYING',
102 options=dict(bdist_mpkg=dict(zipdist=True,
102 readme='contrib/macosx/Readme.html',
103 license='COPYING',
103 welcome='contrib/macosx/Welcome.html')),
104 readme='contrib/macosx/Readme.html',
104 **py2exe_opts)
105 welcome='contrib/macosx/Welcome.html')),
106 **py2exe_opts)
General Comments 0
You need to be logged in to leave comments. Login now