Mercurial > hg-stable
changeset 6514:3d73b870b3ae
Merge from main.
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Fri, 11 Apr 2008 08:35:37 +0200 |
| parents | 368a4ec603cc (current diff) 66e87c11447d (diff) |
| children | f65ac37f0a15 |
| files | |
| diffstat | 2 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/win32/hg.bat Fri Apr 11 08:35:37 2008 +0200 @@ -0,0 +1,12 @@ +@echo off +rem Windows Driver script for Mercurial + +setlocal +set HG=%~f0 + +rem Use a full path to Python (relative to this script) as the standard Python +rem install does not put python.exe on the PATH... +rem %~dp0 is the directory of this script + +%~dp0..\python "%~dp0hg" %* +endlocal
--- a/setup.py Thu Apr 10 15:02:24 2008 -0500 +++ b/setup.py Fri Apr 11 08:35:37 2008 +0200 @@ -19,6 +19,9 @@ import mercurial.version extra = {} +scripts = ['hg'] +if os.name == 'nt': + scripts.append('contrib/win32/hg.bat') # simplified version of distutils.ccompiler.CCompiler.has_function # that actually removes its temporary files. @@ -119,7 +122,7 @@ url='http://selenic.com/mercurial', description='Scalable distributed SCM', license='GNU GPL', - scripts=['hg'], + scripts=scripts, packages=packages, ext_modules=ext_modules, data_files=[(os.path.join('mercurial', root),