# HG changeset patch # User Steve Borho # Date 1197072924 21600 # Node ID f22708f50213ae66ab79a4d086c7784295153e16 # Parent ea2625655baf6b2750062e0c6b54b07fd56c6c2b win32: do not install bash hgmerge on Windows diff -r ea2625655baf -r f22708f50213 setup.py --- a/setup.py Fri Dec 07 18:14:16 2007 -0600 +++ b/setup.py Fri Dec 07 18:15:24 2007 -0600 @@ -40,6 +40,11 @@ except ImportError: pass +if os.name in ['nt']: + extra['scripts'] = ['hg'] +else: + extra['scripts'] = ['hg', 'hgmerge'] + # specify version string, otherwise 'hg identify' will be used: version = '' @@ -78,7 +83,6 @@ [os.path.join(root, file_) for file_ in files]) for root, dirs, files in os.walk('templates')], cmdclass=cmdclass, - scripts=['hg', 'hgmerge'], options=dict(py2exe=dict(packages=['hgext']), bdist_mpkg=dict(zipdist=True, license='COPYING',