Updated build scrits for upstream rabbitmq-c

3 files changed, 5 insertions, 32 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 4287ace..971ccec 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,8 +9,6 @@ include setup.cfg
 recursive-include librabbitmq *
 recursive-include Modules *
 recursive-include tests *
-recursive-include clib *
-recursive-include rabbitmq-codegen *
 prune *.pyc
 prune *.o
 prune *.la
diff --git a/Makefile b/Makefile
index 8147268..f2fc202 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
 # Building
 RABBIT_DIR=rabbitmq-c
-CODEGEN_DIR=rabbitmq-codegen
 RABBIT_TARGET=clib
-RABBIT_DIST=rabbitmq-c-0.5.3
+RABBIT_DIST=rabbitmq-c-0.8.0
 
 # Distribuition tools
 PYTHON=python
@@ -10,13 +9,11 @@ PYTHON=python
 all: build
 
 add-submodules:
-	-git submodule add https://github.com/ask/rabbitmq-c.git
-	-git submodule add https://github.com/rabbitmq/rabbitmq-codegen
+	-git submodule add -b v0.8.0 https://github.com/alanxz/rabbitmq-c.git
 
 submodules:
 	git submodule init
 	git submodule update
-	(cd $(RABBIT_DIR); rm -rf codegen; ln -sf ../$(CODEGEN_DIR) ./codegen)
 
 rabbitmq-c: submodules
 	(cd $(RABBIT_DIR); test -f configure || autoreconf -i)
@@ -25,11 +22,9 @@ rabbitmq-c: submodules
 
 rabbitmq-clean:
 	-(cd $(RABBIT_DIR) && make clean)
-	-(cd $(RABBIT_TARGET) && make clean)
 
 rabbitmq-distclean:
 	-(cd $(RABBIT_DIR) && make distclean)
-	-(cd $(RABBIT_TARGET) && make distclean)
 
 clean-build:
 	-rm -rf build
@@ -57,7 +52,7 @@ distclean: pyclean rabbitmq-distclean removepyc
 
 $(RABBIT_TARGET):
 	(test -f config.h || cd $(RABBIT_DIR); ./configure --disable-tools --disable-docs)
-	(cd $(RABBIT_DIR); make distdir)
+	(cd $(RABBIT_DIR); make)
 	mv "$(RABBIT_DIR)/$(RABBIT_DIST)" "$(RABBIT_TARGET)"
 
 
diff --git a/setup.py b/setup.py
index 58118de..4a94d90 100644
--- a/setup.py
+++ b/setup.py
@@ -5,9 +5,8 @@ from setuptools import setup, find_packages
 
 # --with-librabbitmq=<dir>: path to librabbitmq package if needed
 
-LRMQDIST = lambda *x: os.path.join('clib', *x)
+LRMQDIST = lambda *x: os.path.join('rabbitmq-c', *x)
 LRMQSRC = lambda *x: LRMQDIST('librabbitmq', *x)
-SPECPATH = lambda *x: os.path.join('rabbitmq-codegen', *x)
 PYCP = lambda *x: os.path.join('Modules', '_librabbitmq', *x)
 
 
@@ -20,24 +19,6 @@ def senv(*k__v, **kwargs):
     return dict((k, v) for k, v in restore.iteritems() if v is not None)
 
 
-def codegen():
-    codegen = LRMQSRC('codegen.py')
-    spec = SPECPATH('amqp-rabbitmq-0.9.1.json')
-    sys.path.insert(0, SPECPATH())
-    commands = [
-        (sys.executable, codegen, 'header', spec, LRMQSRC('amqp_framing.h')),
-        (sys.executable, codegen, 'body', spec, LRMQSRC('amqp_framing.c')),
-    ]
-    restore = senv(('PYTHONPATH', SPECPATH()), sep=':')
-    try:
-        for command in commands:
-            print('- generating %r' % command[-1])
-            print(' '.join(command))
-            os.system(' '.join(command))
-    finally:
-        os.environ.update(restore)
-
-
 def create_builder():
     from setuptools import Extension
     from distutils.command.build import build as _build
@@ -81,7 +62,7 @@ def create_builder():
         'amqp_socket.c',
         'amqp_table.c',
         'amqp_tcp_socket.c',
-        'amqp_timer.c',
+        'amqp_time.c',
         'amqp_url.c',
     ])
 
@@ -150,7 +131,6 @@ def create_builder():
             restore = senv(
                 ('CFLAGS', ' '.join(self.stdcflags)),
             )
-            codegen()
             try:
                 _build.run(self)
             finally: