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

Making two changes so that quickumls_simstring can build again on Windows #9

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

Making two changes so that quickumls_simstring can build again on Windows #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a4542c
Making two changes so that quickumls_simstring can build again on Win…
burgersmoke Sep 13, 2020
395aa5d
After previous commit to fix linking error, realized that .PYD files …
burgersmoke Sep 19, 2020
d308128
Re-adding a line which was accidentally removed during cleanup leadin…
burgersmoke Sep 19, 2020
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
22 changes: 20 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"""

import sys
import shutil
import re
import os.path
from distutils.core import setup, Extension
Expand Down Expand Up @@ -41,13 +42,26 @@ def install(self):
# for each file, match string between
# second last and last dot and trim it
matcher = re.compile('\.([^.]+)\.so$')

for i, outfile in enumerate(outfiles):
# NOTE that since Windows cannot link with an extention name like 'quickumls_simstring/_simstring'
# we must work around an install-time issue to make sure that PYD libs still go to installdir/quickumls_simstring
if '.pyd' in outfile.lower():
pyd_file = os.path.basename(outfile)
# let's copy any .PYD files from the root into the installdir/quickumls_simstring
source_path = os.path.join(self.build_dir, pyd_file)
target_path = os.path.join(self.install_dir, 'quickumls_simstring', pyd_file)
print('Manually copying a Windows PYD from {0} to {1}'.format(source_path, target_path))
shutil.copy(source_path, target_path)

return [batch_rename(file, re.sub(matcher, '.so', file))
for file in outfiles]

additional_include_dirs = []
library_dirs = None
extra_compile_args = None
libs = []
extension_name = 'quickumls_simstring/_simstring'
if sys.platform.startswith("darwin") or sys.platform.startswith("cygwin"):
libs = ['-liconv']
elif 'conda' in sys.version.lower() and sys.platform.startswith("win"):
Expand All @@ -59,6 +73,10 @@ def install(self):
anaconda_lib_dir = os.path.join(python_executable_dir, 'Library/lib')
use_conda_deps = True

# this extension name needs to be changed for Windows or there will
# be an unresolved external error at linking time
extension_name = '_simstring'

# let's check if these pieces are actually here before we try to give the include/lib hints below
if not os.path.isfile(os.path.join(anaconda_include_dir, 'iconv.h')):
print('Could not find header iconv.h at [{0}] so bypassing setup hints. Verify that iconv was installed with conda.'.format(anaconda_include_dir))
Expand Down Expand Up @@ -89,11 +107,11 @@ def install(self):
libs += ["-stdlib=libc++", '-Wl,-undefined,dynamic_lookup']
extra_compile_args = ["-stdlib=libc++"]

with open('README.md') as reader:
with open('README.md', encoding = 'utf8') as reader:
readme = reader.read()

simstring_module = Extension(
'quickumls_simstring/_simstring',
extension_name,
sources = [
'quickumls_simstring/export.cpp',
'quickumls_simstring/export_wrap.cpp',
Expand Down