Show More
@@ -2223,13 +2223,11 b' class TestRunner(object):' | |||||
2223 | pure = b"--pure" |
|
2223 | pure = b"--pure" | |
2224 | else: |
|
2224 | else: | |
2225 | pure = b"" |
|
2225 | pure = b"" | |
2226 | py3 = '' |
|
|||
2227 |
|
2226 | |||
2228 | # Run installer in hg root |
|
2227 | # Run installer in hg root | |
2229 | script = os.path.realpath(sys.argv[0]) |
|
2228 | script = os.path.realpath(sys.argv[0]) | |
2230 | exe = sys.executable |
|
2229 | exe = sys.executable | |
2231 | if PYTHON3: |
|
2230 | if PYTHON3: | |
2232 | py3 = b'--c2to3' |
|
|||
2233 | compiler = _bytespath(compiler) |
|
2231 | compiler = _bytespath(compiler) | |
2234 | script = _bytespath(script) |
|
2232 | script = _bytespath(script) | |
2235 | exe = _bytespath(exe) |
|
2233 | exe = _bytespath(exe) | |
@@ -2243,12 +2241,12 b' class TestRunner(object):' | |||||
2243 | # least on Windows for now, deal with .pydistutils.cfg bugs |
|
2241 | # least on Windows for now, deal with .pydistutils.cfg bugs | |
2244 | # when they happen. |
|
2242 | # when they happen. | |
2245 | nohome = b'' |
|
2243 | nohome = b'' | |
2246 |
cmd = (b'%(exe)s setup.py |
|
2244 | cmd = (b'%(exe)s setup.py %(pure)s clean --all' | |
2247 | b' build %(compiler)s --build-base="%(base)s"' |
|
2245 | b' build %(compiler)s --build-base="%(base)s"' | |
2248 | b' install --force --prefix="%(prefix)s"' |
|
2246 | b' install --force --prefix="%(prefix)s"' | |
2249 | b' --install-lib="%(libdir)s"' |
|
2247 | b' --install-lib="%(libdir)s"' | |
2250 | b' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1' |
|
2248 | b' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1' | |
2251 |
% {b'exe': exe, b' |
|
2249 | % {b'exe': exe, b'pure': pure, | |
2252 | b'compiler': compiler, |
|
2250 | b'compiler': compiler, | |
2253 | b'base': os.path.join(self._hgtmp, b"build"), |
|
2251 | b'base': os.path.join(self._hgtmp, b"build"), | |
2254 | b'prefix': self._installdir, b'libdir': self._pythondir, |
|
2252 | b'prefix': self._installdir, b'libdir': self._pythondir, |
General Comments 0
You need to be logged in to leave comments.
Login now