Skip to content

Attempt to run 'protoc' without a prefix if one isn't found. #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kenadia merged 1 commit into from
Jan 10, 2018
Merged

Attempt to run 'protoc' without a prefix if one isn't found. #691

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def initialize_options(self):
self.skip_proto = False
try:
prefix = subprocess.check_output(
'pkg-config --variable prefix protobuf'.split()).strip()
'pkg-config --variable prefix protobuf'.split()).strip().decode('utf-8')
except (subprocess.CalledProcessError, OSError):
if platform.system() == 'Linux':
# Default to /usr?
Expand All @@ -67,8 +67,15 @@ def initialize_options(self):
'Windows. OpenHTF will be installed without it.')
self.skip_proto = True

self.protoc = os.path.join(prefix, b'bin', b'protoc')
self.protodir = os.path.join(prefix, b'include')
maybe_protoc = os.path.join(prefix, 'bin', 'protoc')
if os.path.isfile(maybe_protoc) and os.access(maybe_protoc, os.X_OK):
self.protoc = maybe_protoc
else:
print('Warning: protoc not found at %s' % maybe_protoc)
print('setup will attempt to run protoc with no prefix.')
self.protoc = 'protoc'

self.protodir = os.path.join(prefix, 'include')
self.indir = os.getcwd()
self.outdir = os.getcwd()

Expand All @@ -79,8 +86,11 @@ def run(self):
if self.skip_proto:
print('Skipping building protocol buffers.')
return

# Build regular proto files.
protos = glob.glob(os.path.join(self.indir, 'openhtf', 'output', 'proto', '*.proto'))
protos = glob.glob(
os.path.join(self.indir, 'openhtf', 'output', 'proto', '*.proto'))

if protos:
print('Attempting to build proto files:\n%s' % '\n'.join(protos))
cmd = [
Expand All @@ -93,9 +103,12 @@ def run(self):
subprocess.check_call(cmd)
except OSError as e:
if e.errno == errno.ENOENT:
print('Could not find the protobuf compiler at %s' % self.protoc)
print('On many Linux systems, this is fixed by installing the '
'"protobuf-compiler" and "libprotobuf-dev" packages.')
print('Could not find the protobuf compiler at \'%s\'' % self.protoc)
if sys.platform.startswith('linux'):
print('On many Linux systems, this is fixed by installing the '
'"protobuf-compiler" and "libprotobuf-dev" packages.')
elif sys.platform == 'darwin':
print('On Mac, protobuf is often installed via homebrew.')
raise
except subprocess.CalledProcessError:
print('Could not build proto files.')
Expand Down