Skip to content

Commit

Permalink
Merge pull request #205 from minrk/bundle
Browse files Browse the repository at this point in the history
bundle libzmq as an Extension if it isn't found

The code to do this is largely from pyzmq-static, but with some important differences:

* libzmq as an extension is *optional*
* libzmq/uuid sources are downloaded as-needed
* platform.hpp is attempted by ./configure before falling back on
  shipped versions (also from pyzmq-static)
  
This should make pyzmq pip-installable without libzmq present, and remove the need for the pyzmq-static project to exist separately from pyzmq itself.

closes #128
  • Loading branch information
minrk committed May 24, 2012
2 parents a02bb89 + 3f1afdd commit cbb2742
Show file tree
Hide file tree
Showing 15 changed files with 1,532 additions and 356 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
*.pyc
*.c
zmq/*/*.c
build
dist
conf
bundled_libzmq
*.egg-info
*.so
*.pyd
*.dll
*.dylib
docs/source/api/generated
docs/gh-pages
setup.cfg
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ include setup.cfg.template
include setup.py
include setupegg.py
include zmqversion.py
include buildutils.py

graft docs
prune docs/build
prune docs/gh-pages

graft buildutils
graft examples
graft zmq
graft perf
Expand Down
261 changes: 0 additions & 261 deletions buildutils.py

This file was deleted.

9 changes: 9 additions & 0 deletions buildutils/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
"""utilities for building pyzmq.
Largely adapted from h5py
"""

from .msg import *
from .config import *
from .detect import *
from .bundle import *
Loading

0 comments on commit cbb2742

Please sign in to comment.