Show More
@@ -460,6 +460,9 b' def installhg(options):' | |||||
460 | if options.compiler: |
|
460 | if options.compiler: | |
461 | compiler = '--compiler ' + options.compiler |
|
461 | compiler = '--compiler ' + options.compiler | |
462 | pure = options.pure and "--pure" or "" |
|
462 | pure = options.pure and "--pure" or "" | |
|
463 | py3 = '' | |||
|
464 | if sys.version_info[0] == 3: | |||
|
465 | py3 = '--c2to3' | |||
463 |
|
466 | |||
464 | # Run installer in hg root |
|
467 | # Run installer in hg root | |
465 | script = os.path.realpath(sys.argv[0]) |
|
468 | script = os.path.realpath(sys.argv[0]) | |
@@ -472,11 +475,11 b' def installhg(options):' | |||||
472 | # least on Windows for now, deal with .pydistutils.cfg bugs |
|
475 | # least on Windows for now, deal with .pydistutils.cfg bugs | |
473 | # when they happen. |
|
476 | # when they happen. | |
474 | nohome = '' |
|
477 | nohome = '' | |
475 | cmd = ('%(exe)s setup.py %(pure)s clean --all' |
|
478 | cmd = ('%(exe)s setup.py %(py3)s %(pure)s clean --all' | |
476 | ' build %(compiler)s --build-base="%(base)s"' |
|
479 | ' build %(compiler)s --build-base="%(base)s"' | |
477 | ' install --force --prefix="%(prefix)s" --install-lib="%(libdir)s"' |
|
480 | ' install --force --prefix="%(prefix)s" --install-lib="%(libdir)s"' | |
478 | ' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1' |
|
481 | ' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1' | |
479 | % dict(exe=sys.executable, pure=pure, compiler=compiler, |
|
482 | % dict(exe=sys.executable, py3=py3, pure=pure, compiler=compiler, | |
480 | base=os.path.join(HGTMP, "build"), |
|
483 | base=os.path.join(HGTMP, "build"), | |
481 | prefix=INST, libdir=PYTHONDIR, bindir=BINDIR, |
|
484 | prefix=INST, libdir=PYTHONDIR, bindir=BINDIR, | |
482 | nohome=nohome, logfile=installerrs)) |
|
485 | nohome=nohome, logfile=installerrs)) |
General Comments 0
You need to be logged in to leave comments.
Login now