Skip to content
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

Jump to bottom

bundle libzmq as an Extension if it isn't found #205

Merged
merged 32 commits into from
May 24, 2012
Merged

bundle libzmq as an Extension if it isn't found #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b33bc74
drop in files from pyzmq-static
minrk May 17, 2012
9958e98
step towards bundling libzmq as an Extension
minrk May 3, 2012
b569a70
include both uuid/ and uuid parent
minrk May 17, 2012
e19147f
patch gen_uuid.c from pyzmq-static
minrk May 17, 2012
7cc48b5
avoid rebuilding libzmq
minrk May 17, 2012
5974795
only display "fetching" message when downloading
minrk May 17, 2012
9a3cd4e
use JSON for config, now that we require 2.6
minrk May 17, 2012
83582c9
add line function to buildutils.msg
minrk May 17, 2012
c993341
preempt with error msg if attempted with Python 2.5.
minrk May 17, 2012
72a948a
load different settings for bundled libzmq
minrk May 17, 2012
58e8d55
add bundled libzmq to regular extension list, and setup inside config…
minrk May 17, 2012
b210833
create tempdir only if not bundled
minrk May 17, 2012
d1892aa
fix missing distutils import
minrk May 17, 2012
0f0969e
windows bundling fixes
minrk May 17, 2012
dcfb544
Windows loading in __init__
minrk May 17, 2012
346ba36
include FD_SETSIZE define in bundled libzmq on Windows
minrk May 17, 2012
6b379d5
first stab at fallback to bundled libzmq
minrk May 18, 2012
181dd93
add buildutils to manifest
minrk May 18, 2012
2eb7ddc
always use initlibzmq
minrk May 18, 2012
379b351
buildutils py3compat
minrk May 18, 2012
80d8920
adjustments to fallback message
minrk May 18, 2012
1aa2c37
some license/author notes in setup/buildutils
minrk May 18, 2012
3483221
remove disabled configure
minrk May 18, 2012
e3a6bc8
bundle_libzmq_dylib typo
minrk May 18, 2012
c1afb6b
allow fallback dialog on Windows
minrk May 18, 2012
65485a1
more flexible names for auto zmq
minrk May 18, 2012
c3d34ff
tweak fallback chain and message
minrk May 18, 2012
6376c0a
py3compat in initlibzmq
minrk May 18, 2012
4db1bcf
add wildcards to bundled libzmq glob
minrk May 18, 2012
73399aa
minor cleanup of <hr>s during build
minrk May 19, 2012
73c27b2
add fetchbundle command
minrk May 24, 2012
3f1afdd
docstrings and defines
minrk May 24, 2012
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions buildutils/__init__.py
View file
Open in desktop
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