Skip to content

Fixed windows installation #87

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

Merged
merged 2 commits into from
Aug 31, 2018
Merged

Fixed windows installation #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b78b21b
Ensure xml_config options are list
Aug 31, 2018
43fe1ff
Download windows binaries from github
Aug 31, 2018
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
5 changes: 1 addition & 4 deletions xmlsec_extra.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,16 @@ def get_prebuilt_libs(download_dir, static_include_dirs, static_library_dirs):


def download_and_extract_windows_binaries(destdir):
url = "https://github.com/bgaifullin/libxml2-win-binaries/releases/download/v2018.08/"
if sys.version_info < (3, 5):
if sys.maxsize > 2147483647:
url = "https://ci.appveyor.com/api/buildjobs/7q4nvmkdnu05dul6/artifacts/"
suffix = "vs2008.win64"
else:
url = "https://ci.appveyor.com/api/buildjobs/tdpx6rprr5431ec9/artifacts/"
suffix = "vs2008.win32"
else:
if sys.maxsize > 2147483647:
url = "https://ci.appveyor.com/api/buildjobs/hij3a6776pdv2007/artifacts/"
suffix = "win64"
else:
url = "https://ci.appveyor.com/api/buildjobs/7k878q7rvogcdyd9/artifacts/"
suffix = "win32"

libs = {
Expand Down
7 changes: 4 additions & 3 deletions xmlsec_setupinfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,10 @@ def load_xmlsec1_config():
if config is None or not config.get('libraries'):
fatal_xmlsec1_error()

config.setdefault('libraries', [])
config.setdefault('include_dirs', [])
config.setdefault('library_dirs', [])
# make sure that all options are list
for x in ('libraries', 'include_dirs', 'library_dirs'):
config[x] = list(config.get(x) or [])

# fix macros, ensure that macros is list
macros = list(config.get('define_macros', []))
for i, v in enumerate(macros):
Expand Down