StarMirror
/
xlnt
mirror of https://github.com/tfussell/xlnt
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ignore unknown-pragmas in clang, try to debug lib suffix, install using cmake instead of in setup.py

pull/207/head
Thomas Fussell 2017-08-07 19:00:49 -07:00
parent 5cefbc7dad
commit b54b2399d9
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
python/setup.py
View File

@ -86,6 +86,8 @@ class build_ext(_build_ext):
cmake_options.append('-DCMAKE_BUILD_TYPE={0}'
.format(self.build_type))
cmake_options.append('-DCMAKE_PREFIX={0}'
.format(os.environ['PREFIX']))
if sys.platform != 'win32':
cmake_command = (['cmake', self.extra_cmake_args] +
@ -100,6 +102,9 @@ class build_ext(_build_ext):
if 'XLNTPYARROW_PARALLEL' in os.environ:
args.append('-j{0}'.format(os.environ['XLNTPYARROW_PARALLEL']))
args.append('INSTALL')
print("-- Running cmake --build for xlntpyarrow")
self.spawn(args)
print("-- Finished cmake --build for xlntpyarrow")
@ -122,7 +127,7 @@ class build_ext(_build_ext):
print("-- Finished cmake for xlntpyarrow")
# Do the build
print("-- Running cmake --build for xlntpyarrow")
self.spawn(['cmake', '--build', '.', '--config', self.build_type])
self.spawn(['cmake', '--build', '.', '--config', self.build_type, '--target', 'INSTALL'])
print("-- Finished cmake --build for xlntpyarrow")
if self.inplace:
@ -148,29 +153,6 @@ class build_ext(_build_ext):
build_prefix = ['source'] + ([self.build_type] if sys.platform == 'win32' else [])
build_prefix = pjoin(*build_prefix)
def move_lib(lib_name):
lib_filename = (shared_library_prefix + lib_name +
shared_library_suffix)
# Also copy libraries with ABI/SO version suffix
if sys.platform == 'darwin':
lib_pattern = (shared_library_prefix + lib_name +
".*" + shared_library_suffix[1:])
libs = glob.glob(pjoin(build_prefix, lib_pattern))
else:
libs = glob.glob(pjoin(build_prefix, lib_filename) + '*')
# Longest suffix library should be copied, all others symlinked
libs.sort(key=lambda s: -len(s))
lib_filename = os.path.basename(libs[0])
shutil.move(pjoin(build_prefix, lib_filename),
pjoin(build_lib, 'xlntpyarrow', lib_filename))
for lib in libs[1:]:
filename = os.path.basename(lib)
link_name = pjoin(build_lib, 'xlntpyarrow', filename)
if not os.path.exists(link_name):
os.symlink(lib_filename, link_name)
move_lib('xlnt')
self._found_names = []
built_path = self.get_ext_built('lib')
if not os.path.exists(built_path):
@ -212,6 +194,7 @@ class build_ext(_build_ext):
return pjoin(head, self.build_type, tail + suffix)
else:
suffix = sysconfig.get_config_var('SO')
print('suffix is', suffix)
return name + suffix
def get_names(self):

2
source/CMakeLists.txt
View File

@ -31,7 +31,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unknown-pragmas")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Werror -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-documentation-unknown-command")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Werror -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-documentation-unknown-command -Wno-unknown-pragmas")
endif()
if(APPLE)