← Back to branch summary

~jtaylor/ubuntu/precise/python-numpy/multiarch-fix-818867

« back to all changes in this revision

Viewing changes to numpy/core/setupscons.py

  • Committer: Bazaar Package Importer
  • Author(s): Sandro Tosi
  • Date: 2010-10-07 10:19:13 UTC
  • mfrom: (7.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20101007101913-8b1kmt8ho4upcl9s
Tags: 1:1.4.1-5
http://bugs.debian.org/581058
* debian/patches/10_use_local_python.org_object.inv_sphinx.diff
  - fixed small typo in description
* debian/patches/changeset_r8364.diff
  - fix memory corruption (double free); thanks to Joseph Barillari for the
    report and to Michael Gilbert for pushing resolution; Closes: #581058

Show diffs side-by-side

added added

removed removed

Lines of Context:
numpy/core/setupscons.py
22
22
    # List of files to register to numpy.distutils
23
23
    dot_blas_src = [join('blasdot', '_dotblas.c'),
24
24
                    join('blasdot', 'cblas.h')]
25
 
    api_definition = [join('code_generators', 'array_api_order.txt'),
26
 
                      join('code_generators', 'multiarray_api_order.txt'),
 
25
    api_definition = [join('code_generators', 'numpy_api_order.txt'),
27
26
                      join('code_generators', 'ufunc_api_order.txt')]
28
27
    core_src = [join('src', basename(i)) for i in glob.glob(join(local_dir,
29
28
                                                                'src',
63
62
        # XXX: I really have to think about how to communicate path info
64
63
        # between scons and distutils, and set the options at one single
65
64
        # location.
66
 
        h_file = join(get_scons_pkg_build_dir(config.name), '__multiarray_api.h')
67
 
        t_file = join(get_scons_pkg_build_dir(config.name), 'multiarray_api.txt')
 
65
        h_file = join(get_scons_pkg_build_dir(config.name),
 
66
                'include/numpy/__multiarray_api.h')
 
67
        t_file = join(get_scons_pkg_build_dir(config.name),
 
68
                'include/numpy/multiarray_api.txt')
68
69
        config.add_data_files((header_dir, h_file),
69
70
                              (header_dir, t_file))
70
71
 
73
74
        # XXX: I really have to think about how to communicate path info
74
75
        # between scons and distutils, and set the options at one single
75
76
        # location.
76
 
        h_file = join(get_scons_pkg_build_dir(config.name), '__ufunc_api.h')
77
 
        t_file = join(get_scons_pkg_build_dir(config.name), 'ufunc_api.txt')
 
77
        h_file = join(get_scons_pkg_build_dir(config.name),
 
78
                'include/numpy/__ufunc_api.h')
 
79
        t_file = join(get_scons_pkg_build_dir(config.name),
 
80
                'include/numpy/ufunc_api.txt')
78
81
        config.add_data_files((header_dir, h_file),
79
82
                              (header_dir, t_file))
80
83
 
87
90
    config.add_sconscript('SConstruct',
88
91
                          post_hook = add_generated_files,
89
92
                          source_files = source_files)
 
93
    config.add_scons_installed_library('npymath', 'lib')
90
94
 
91
95
    config.add_data_files('include/numpy/*.h')
92
96
    config.add_include_dirs('src')