##// END OF EJS Templates
win32: do not install bash hgmerge on Windows
Steve Borho -
r5623:f22708f5 default
parent child Browse files
Show More
@@ -40,6 +40,11 b' try:'
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
43 # specify version string, otherwise 'hg identify' will be used:
48 # specify version string, otherwise 'hg identify' will be used:
44 version = ''
49 version = ''
45
50
@@ -78,7 +83,6 b" setup(name='mercurial',"
78 [os.path.join(root, file_) for file_ in files])
83 [os.path.join(root, file_) for file_ in files])
79 for root, dirs, files in os.walk('templates')],
84 for root, dirs, files in os.walk('templates')],
80 cmdclass=cmdclass,
85 cmdclass=cmdclass,
81 scripts=['hg', 'hgmerge'],
82 options=dict(py2exe=dict(packages=['hgext']),
86 options=dict(py2exe=dict(packages=['hgext']),
83 bdist_mpkg=dict(zipdist=True,
87 bdist_mpkg=dict(zipdist=True,
84 license='COPYING',
88 license='COPYING',
General Comments 0
You need to be logged in to leave comments. Login now