Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions MANIFEST.in

This file was deleted.

3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ erl_test: erl_compile
# Python specific build steps
python_compile:
@echo "==> Python (compile)"
@./proto_cmd.py build_proto
@./setup.py build

python_clean:
@echo "==> Python (clean)"
@./setup.py clean
@./proto_cmd.py clean_proto

python_release: python_compile
@echo "==> Python (release)"
Expand Down
6 changes: 4 additions & 2 deletions proto_cmd.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/usr/bin/env python

from distutils.spawn import find_executable
from distutils.command.build import build
from distutils.command.clean import clean
from distutils.cmd import Command
from distutils import log
from distutils.core import setup
import sys
import os

Expand Down Expand Up @@ -86,5 +89,4 @@ def generate_proto(self, source, outputdir):
if result is not None and result[1] is not 0:
raise SystemError("protoc command failed: '%s'" % protoc_command.join(' '))

# Inject our .proto compiler into the front of the build commands
build.sub_commands.insert(0, ('build_proto', None))
setup(packages=['riak_pb'], cmdclass={'build_proto': build_proto, 'clean_proto': clean_proto})
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env python

from setuptools import setup
from proto_cmd import build_proto, clean_proto

setup(name='riak_pb',
version='1.2.1',
Expand All @@ -19,7 +18,5 @@
classifiers=['License :: OSI Approved :: Apache Software License',
'Intended Audience :: Developers',
'Operating System :: OS Independent',
'Topic :: Database'],
cmdclass={'build_proto': build_proto,
'clean': clean_proto}
'Topic :: Database']
)