Skip to content

build scripts update #210

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

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

build scripts update #210

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8103860
setup.py: read MASON_ROOT and MAPNIK_CONFIG from environment
lightmare Aug 15, 2019
c2c66e0
setup.py: do not search for shared boost libraries in mason build
lightmare Aug 21, 2019
eea5b00
update test/ submodules
lightmare Aug 21, 2019
a66006e
add submodule mason/ and pin to v0.20.0
lightmare Aug 22, 2019
7426180
bootstrap: move postgres setup to separate script
lightmare Aug 22, 2019
f0e39b2
bootstrap: respect MASON_ROOT
lightmare Aug 22, 2019
8c4e399
bootstrap: update dependencies
lightmare Aug 22, 2019
75e6732
bootstrap: behave when sourced, don't exit on error
lightmare Aug 22, 2019
c78d3f7
travis: update script
lightmare Aug 22, 2019
5365612
travis: newest mason needed to get newest mapnik
lightmare Aug 22, 2019
2b0a204
run_tests.py: flush stdout before starting nose
lightmare Aug 29, 2019
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
Prev Previous commit
Next Next commit
setup.py: do not search for shared boost libraries in mason build
  • Loading branch information
@lightmare
lightmare committed Aug 21, 2019
commit c2c66e0c2699ca7608f4ffe1c8638f9fe01086e1
8 changes: 6 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ def get_boost_library_names():
found = []
missing = []
for _id in wanted:
name = os.environ.get("%s_LIB" % _id.upper(), find_boost_library(_id))
name = os.environ.get("%s_LIB" % _id.upper())
if name is None:
name = _id if mason_build else find_boost_library(_id)
if name:
found.append(name)
else:
Expand All @@ -79,7 +81,9 @@ def finalize_options(self):
pass

def run(self):
print("\n".join(get_boost_library_names()))
print("Found boost libraries:")
for lib in get_boost_library_names():
print("\t" + lib)


cflags = sysconfig.get_config_var('CFLAGS')
Expand Down