[PATCH 2 of 7] win32: do not install bash hgmerge on Windows
Steve Borho
steve at borho.org
Fri Dec 7 18:29:32 CST 2007
# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1197072924 21600
# Node ID 61b66cf446dbfee143a01e62a306334812b08e71
# Parent f274d989f14fc3d74ce1c9fd52d3e9f81db9aec4
win32: do not install bash hgmerge on Windows
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,11 @@ except ImportError:
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 @@ setup(name='mercurial',
[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',
More information about the Mercurial-devel
mailing list