ENH: update bento build to recent changes in numpy.core.

cournape · cournape · commit ec59e5af2104 · 2011-08-29T00:32:27.000+02:00
diff --git a/numpy/core/bento.info b/numpy/core/bento.info
@@ -8,15 +8,15 @@ Library:
             src/npymath/npy_math.c.src,
             src/npymath/npy_math_complex.c.src,
             src/npymath/halffloat.c
+    CompiledLibrary: npysort
+        Sources:
+            src/npysort/sort.c.src
     Extension: multiarray
         Sources:
             src/multiarray/multiarraymodule_onefile.c
     Extension: multiarray_tests
         Sources:
             src/multiarray/multiarray_tests.c.src
-    Extension: _sort
-        Sources:
-            src/_sortmodule.c.src
     Extension: umath
         Sources:
             src/umath/umathmodule_onefile.c
diff --git a/numpy/core/bscript b/numpy/core/bscript
@@ -389,6 +389,12 @@ def pbuild(context):
                                                use="cloadable")
     context.register_compiled_library_builder("npymath", builder)
 
+    def builder_sort(library):
+        return context.default_library_builder(library,
+                                               includes=[".", "src/private", "src/npysort"],
+                                               use="npymath")
+    context.register_compiled_library_builder("npysort", builder_sort)
+
     def builder_multiarray(extension):
         bld(name="multiarray_api",
             features="numpy_api_gen",
@@ -397,7 +403,7 @@ def pbuild(context):
 
         multiarray_templates = ["src/multiarray/scalartypes.c.src",
                 "src/multiarray/arraytypes.c.src", 
-                "src/multiarray/nditer.c.src",
+                "src/multiarray/nditer_templ.c.src",
                 "src/multiarray/lowlevel_strided_loops.c.src", 
                 "src/multiarray/einsum.c.src"]
         bld(target="multiarray_templates", source=multiarray_templates)
@@ -430,7 +436,7 @@ def pbuild(context):
                 pjoin('src', 'multiarray', 'refcount.c'),
                 pjoin('src', 'multiarray', 'arraytypes.c.src'),
                 pjoin('src', 'multiarray', 'scalartypes.c.src'),
-                pjoin('src', 'multiarray', 'nditer.c.src'),
+                pjoin('src', 'multiarray', 'nditer_templ.c.src'),
                 pjoin('src', 'multiarray', 'lowlevel_strided_loops.c.src'),
                 pjoin('src', 'multiarray', 'dtype_transfer.c'),
                 pjoin('src', 'multiarray', 'nditer_pywrap.c'),
@@ -443,15 +449,9 @@ def pbuild(context):
         return context.default_builder(extension,
                                        includes=includes,
                                        source=sources,
-                                       use="npymath")
+                                       use="npysort npymath")
     context.register_builder("multiarray", builder_multiarray)
 
-    def builder_sort(extension):
-        return context.default_builder(extension,
-                                       includes=[".", "src/private"],
-                                       use="npymath")
-    context.register_builder("_sort", builder_sort)
-
     def build_ufunc(extension):
         bld(features="ufunc_api_gen",
             api_tuple=ufunc_api,
