Commit 83bba017 authored by Chichi Lalescu's avatar Chichi Lalescu
Browse files

Merge branch 'bugfix/sdist' into develop

parents 51b62173 40c70690
......@@ -33,14 +33,8 @@ import pkg_resources
__version__ = pkg_resources.require('bfps')[0].version
_dist = pkg_resources.get_distribution('bfps')
# Normalize case for Windows systems
dist_loc = os.path.normcase(os.path.realpath(_dist.location))
dist_loc = os.path.realpath(_dist.location)
here = os.path.normcase(__file__)
if not here.startswith(os.path.join(dist_loc, 'bfps')):
# not installed, but there is another version that *is*
header_dir = os.path.join(os.path.dirname(here), 'cpp')
lib_dir = os.path.dirname(here)
raise pkg_resources.DistributionNotFound
header_dir = os.path.join(os.path.join(dist_loc, 'bfps'), 'cpp')
lib_dir = os.path.join(dist_loc, 'bfps')
......
......@@ -83,10 +83,9 @@ src_file_list = ['field_descriptor',
header_list = ['cpp/base.hpp'] + ['cpp/' + fname + '.hpp' for fname in src_file_list]
#with open('MANIFEST.in', 'w') as manifest_in_file:
# manifest_in_file.write('include libbfps.a\n')
# for fname in ['bfps/cpp/' + fname + '.cpp' for fname in src_file_list] + header_list:
# manifest_in_file.write('include {0}\n'.format(fname))
with open('MANIFEST.in', 'w') as manifest_in_file:
for fname in ['bfps/cpp/' + fname + '.cpp' for fname in src_file_list] + header_list:
manifest_in_file.write('include {0}\n'.format(fname))
libraries = ['fftw3_mpi',
'fftw3',
......
......@@ -6,6 +6,7 @@ sitepackages = True
whitelist_externals =
echo
cp
g++
passenv = LD_LIBRARY_PATH
changedir =
{envtmpdir}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment