diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2011-06-19 19:26:32 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-06-19 19:26:32 -0600 |
| commit | e4d790f005331e5ff59d54b9954ab56ec847bafc (patch) | |
| tree | f79af5d51d1418066701e7bcfb5e183ba0b3cfb0 /numpy | |
| parent | bdb5ed82298f170abaf14393843538a8f3af9d36 (diff) | |
| download | numpy-e4d790f005331e5ff59d54b9954ab56ec847bafc.tar.gz | |
ENH: Generate the npysort library for linking during build, but do not
install it.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/SConscript | 9 | ||||
| -rw-r--r-- | numpy/core/npysort.ini.in | 18 | ||||
| -rw-r--r-- | numpy/core/setup.py | 9 |
3 files changed, 5 insertions, 31 deletions
diff --git a/numpy/core/SConscript b/numpy/core/SConscript index e059a1353..c57549c20 100644 --- a/numpy/core/SConscript +++ b/numpy/core/SConscript @@ -384,7 +384,6 @@ nditer_src = env.GenerateFromTemplate( lowlevel_strided_loops_src = env.GenerateFromTemplate( pjoin('src', 'multiarray', 'lowlevel_strided_loops.c.src')) einsum_src = env.GenerateFromTemplate(pjoin('src', 'multiarray', 'einsum.c.src')) -#sortmodule_src = env.GenerateFromTemplate(pjoin('src', 'npysort','sortmodule.c.src')) umathmodule_src = env.GenerateFromTemplate(pjoin('src', 'umath', 'umathmodule.c.src')) umath_tests_src = env.GenerateFromTemplate(pjoin('src', 'umath', @@ -433,16 +432,10 @@ env.Install('$distutils_installdir/lib/npy-pkg-config', npymath_ini) # npysort core lib npysort_src = [env.GenerateFromTemplate(pjoin('src', 'npysort', 'sort.c.src'))] -env.DistutilsInstalledStaticExtLibrary("npysort", npysort_src, install_dir='lib') +env.StaticExtLibrary("npysort", npysort_src) env.Prepend(LIBS=["npysort"]) env.Prepend(LIBPATH=["."]) -subst_dict = {'@prefix@': '$distutils_install_prefix', - '@pkgname@': 'numpy.core', '@sep@': os.path.sep} -npysort_ini = env.SubstInFile(pjoin('lib', 'npy-pkg-config', 'npysort.ini'), - 'npysort.ini.in', SUBST_DICT=subst_dict) -env.Install('$distutils_installdir/lib/npy-pkg-config', npysort_ini) - #----------------- # Build multiarray #----------------- diff --git a/numpy/core/npysort.ini.in b/numpy/core/npysort.ini.in deleted file mode 100644 index 66e08ccfa..000000000 --- a/numpy/core/npysort.ini.in +++ /dev/null @@ -1,18 +0,0 @@ -[meta] -Name = npysort -Description = Core sort library for Numpy -Version = 0.1 - -[variables] -pkgname = @pkgname@ -prefix = ${pkgdir} -libdir = ${prefix}@sep@lib -includedir = ${prefix}@sep@include - -[default] -Libs = -L${libdir} -lnpysort -Cflags = -I${includedir} - -[msvc] -Libs = /LIBPATH:${libdir} npysort.lib -Cflags = /INCLUDE:${includedir} diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 1a596b5e9..92f96c233 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -670,11 +670,10 @@ def configuration(parent_package='',top_path=None): ####################################################################### #subst_dict = dict([("sep", os.path.sep), ("pkgname", "numpy.core")]) - config.add_installed_library('npysort', - sources = [join('src', 'npysort', 'sort.c.src')], - install_dir = 'lib') - config.add_npy_pkg_config("npysort.ini.in", "lib/npy-pkg-config", - subst_dict) + config.add_library('npysort', + sources = [join('src', 'npysort', 'sort.c.src')]) +# config.add_npy_pkg_config("npysort.ini.in", "lib/npy-pkg-config", +# subst_dict) ####################################################################### # multiarray module # |