Mercurial > hg
comparison setup.py @ 6009:f077815932ce
filemerge: remove the hgmerge script
This is now better handled using [merge-tools] and [merge-patterns] in hgrc.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 03 Feb 2008 19:29:05 -0600 |
parents | f22708f50213 |
children | 39cfcef4f463 |
comparison
equal
deleted
inserted
replaced
6008:33bfedc0be4a | 6009:f077815932ce |
---|---|
38 extra['console'] = ['hg'] | 38 extra['console'] = ['hg'] |
39 | 39 |
40 except ImportError: | 40 except ImportError: |
41 pass | 41 pass |
42 | 42 |
43 if os.name in ['nt']: | |
44 extra['scripts'] = ['hg'] | |
45 else: | |
46 extra['scripts'] = ['hg', 'hgmerge'] | |
47 | |
48 # specify version string, otherwise 'hg identify' will be used: | 43 # specify version string, otherwise 'hg identify' will be used: |
49 version = '' | 44 version = '' |
50 | 45 |
51 class install_package_data(install_data): | 46 class install_package_data(install_data): |
52 def finalize_options(self): | 47 def finalize_options(self): |
75 author='Matt Mackall', | 70 author='Matt Mackall', |
76 author_email='mpm@selenic.com', | 71 author_email='mpm@selenic.com', |
77 url='http://selenic.com/mercurial', | 72 url='http://selenic.com/mercurial', |
78 description='Scalable distributed SCM', | 73 description='Scalable distributed SCM', |
79 license='GNU GPL', | 74 license='GNU GPL', |
75 scripts=['hg'], | |
80 packages=['mercurial', 'mercurial.hgweb', 'hgext', 'hgext.convert'], | 76 packages=['mercurial', 'mercurial.hgweb', 'hgext', 'hgext.convert'], |
81 ext_modules=ext_modules, | 77 ext_modules=ext_modules, |
82 data_files=[(os.path.join('mercurial', root), | 78 data_files=[(os.path.join('mercurial', root), |
83 [os.path.join(root, file_) for file_ in files]) | 79 [os.path.join(root, file_) for file_ in files]) |
84 for root, dirs, files in os.walk('templates')], | 80 for root, dirs, files in os.walk('templates')], |