##// END OF EJS Templates
setup: include additional packages in py2exe distribution...
setup: include additional packages in py2exe distribution I'm attempting to reproduce the Inno installers on my local machine. As part of auditing differences between installer output, I noticed that the existing Inno installers include various 3rd party packages. There is no mention of this in the build instructions nor on the wiki. This must be something that is done by the installer producer. This commit teaches setup.py to include these 3rd party packages in py2exe's library. After this change, I am able to produce Inno installers that have a nearly identical set of Python modules. It's worth noting that pywin32 is included even though it probably shouldn't be. But including it is necessary in order to achieve parity with existing Inno installers. Differential Revision: https://phab.mercurial-scm.org/D6064

File last commit:

r41020:6a372f94 default
r42017:ed350574 default
Show More
hgclient.py
147 lines | 4.0 KiB | text/x-python | PythonLexer
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 # A minimal client for Mercurial's command server
Pulkit Goyal
hgclient: use absolute_import and print_function
r28355 from __future__ import absolute_import, print_function
Yuya Nishihara
py3: rewrite StringIO fallback for Python 3
r40353
import io
Pulkit Goyal
hgclient: use absolute_import and print_function
r28355 import os
Yuya Nishihara
py3: reinvent print() function for contrib/hgclient.py
r40352 import re
Pulkit Goyal
hgclient: use absolute_import and print_function
r28355 import signal
import socket
import struct
import subprocess
import sys
import time
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566
Yuya Nishihara
py3: work around unicode stdio streams in contrib/hgclient.py
r40351 if sys.version_info[0] >= 3:
stdout = sys.stdout.buffer
stderr = sys.stderr.buffer
Yuya Nishihara
py3: rewrite StringIO fallback for Python 3
r40353 stringio = io.BytesIO
Yuya Nishihara
py3: reinvent print() function for contrib/hgclient.py
r40352 def bprint(*args):
# remove b'' as well for ease of test migration
pargs = [re.sub(br'''\bb(['"])''', br'\1', b'%s' % a) for a in args]
stdout.write(b' '.join(pargs) + b'\n')
Yuya Nishihara
py3: work around unicode stdio streams in contrib/hgclient.py
r40351 else:
Yuya Nishihara
py3: rewrite StringIO fallback for Python 3
r40353 import cStringIO
Yuya Nishihara
py3: work around unicode stdio streams in contrib/hgclient.py
r40351 stdout = sys.stdout
stderr = sys.stderr
Yuya Nishihara
py3: rewrite StringIO fallback for Python 3
r40353 stringio = cStringIO.StringIO
Yuya Nishihara
py3: reinvent print() function for contrib/hgclient.py
r40352 bprint = print
Yuya Nishihara
py3: work around unicode stdio streams in contrib/hgclient.py
r40351
Yuya Nishihara
commandserver: add experimental option to use separate message channel...
r40625 def connectpipe(path=None, extraargs=()):
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 cmdline = [b'hg', b'serve', b'--cmdserver', b'pipe']
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 if path:
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 cmdline += [b'-R', path]
Yuya Nishihara
commandserver: add experimental option to use separate message channel...
r40625 cmdline.extend(extraargs)
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566
Matt Harbison
py3: convert popen() command arguments in hgclient to str on Windows...
r41020 def tonative(cmdline):
if os.name != r'nt':
return cmdline
return [arg.decode("utf-8") for arg in cmdline]
server = subprocess.Popen(tonative(cmdline), stdin=subprocess.PIPE,
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 stdout=subprocess.PIPE)
return server
Yuya Nishihara
test-commandserver: add connector for unix domain socket server...
r22993 class unixconnection(object):
def __init__(self, sockpath):
self.sock = sock = socket.socket(socket.AF_UNIX)
sock.connect(sockpath)
self.stdin = sock.makefile('wb')
self.stdout = sock.makefile('rb')
def wait(self):
self.stdin.close()
self.stdout.close()
self.sock.close()
class unixserver(object):
def __init__(self, sockpath, logpath=None, repopath=None):
self.sockpath = sockpath
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 cmdline = [b'hg', b'serve', b'--cmdserver', b'unix', b'-a', sockpath]
Yuya Nishihara
test-commandserver: add connector for unix domain socket server...
r22993 if repopath:
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 cmdline += [b'-R', repopath]
Yuya Nishihara
test-commandserver: add connector for unix domain socket server...
r22993 if logpath:
stdout = open(logpath, 'a')
stderr = subprocess.STDOUT
else:
stdout = stderr = None
self.server = subprocess.Popen(cmdline, stdout=stdout, stderr=stderr)
# wait for listen()
while self.server.poll() is None:
if os.path.exists(sockpath):
break
time.sleep(0.1)
def connect(self):
return unixconnection(self.sockpath)
def shutdown(self):
os.kill(self.server.pid, signal.SIGTERM)
self.server.wait()
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 def writeblock(server, data):
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 server.stdin.write(struct.pack(b'>I', len(data)))
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 server.stdin.write(data)
server.stdin.flush()
def readchannel(server):
data = server.stdout.read(5)
if not data:
raise EOFError
channel, length = struct.unpack('>cI', data)
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 if channel in b'IL':
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 return channel, length
else:
return channel, server.stdout.read(length)
def sep(text):
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 return text.replace(b'\\', b'/')
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566
Yuya Nishihara
py3: work around unicode stdio streams in contrib/hgclient.py
r40351 def runcommand(server, args, output=stdout, error=stderr, input=None,
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 outfilter=lambda x: x):
Yuya Nishihara
py3: reinvent print() function for contrib/hgclient.py
r40352 bprint(b'*** runcommand', b' '.join(args))
Yuya Nishihara
py3: work around unicode stdio streams in contrib/hgclient.py
r40351 stdout.flush()
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 server.stdin.write(b'runcommand\n')
writeblock(server, b'\0'.join(args))
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566
if not input:
timeless
test-commandserver: handle cStringIO.StringIO/io.StringIO divergence
r28836 input = stringio()
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566
while True:
ch, data = readchannel(server)
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 if ch == b'o':
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 output.write(outfilter(data))
output.flush()
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 elif ch == b'e':
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 error.write(data)
error.flush()
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 elif ch == b'I':
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 writeblock(server, input.read(data))
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 elif ch == b'L':
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 writeblock(server, input.readline(data))
Yuya Nishihara
commandserver: add experimental option to use separate message channel...
r40625 elif ch == b'm':
bprint(b"message: %r" % data)
Yuya Nishihara
py3: convert string literals to bytes in contrib/hgclient.py...
r40350 elif ch == b'r':
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 ret, = struct.unpack('>i', data)
if ret != 0:
Yuya Nishihara
py3: reinvent print() function for contrib/hgclient.py
r40352 bprint(b' [%d]' % ret)
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 return ret
else:
Yuya Nishihara
py3: reinvent print() function for contrib/hgclient.py
r40352 bprint(b"unexpected channel %c: %r" % (ch, data))
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 if ch.isupper():
return
Yuya Nishihara
test-commandserver: allow check() to make connection in different way...
r22992 def check(func, connect=connectpipe):
Yuya Nishihara
py3: work around unicode stdio streams in contrib/hgclient.py
r40351 stdout.flush()
Yuya Nishihara
test-commandserver: remove unused repopath argument from check()...
r22991 server = connect()
Yuya Nishihara
test-commandserver: split helper functions to new hgclient module...
r22566 try:
return func(server)
finally:
server.stdin.close()
server.wait()
Yuya Nishihara
commandserver: add experimental option to use separate message channel...
r40625
def checkwith(connect=connectpipe, **kwargs):
def wrap(func):
return check(func, lambda: connect(**kwargs))
return wrap