Added weave.

7 files changed, 16 insertions, 8 deletions

diff --git a/scipy/base/code_generators/generate_array_api.py b/scipy/base/code_generators/generate_array_api.py
index 5c20f5f07..fcf97b6a9 100644
--- a/scipy/base/code_generators/generate_array_api.py
+++ b/scipy/base/code_generators/generate_array_api.py
@@ -495,7 +495,7 @@ multiapi_list = [
     ]
 
 
-types = ['Generic','Numeric','Integer','SignedInteger','UnsignedInteger',
+types = ['Generic','Numeric','Integer','SignedInteger','UnsignedInteger', 'Inexact',
          'Floating', 'Complex', 'Flexible', 'Character',
          'Bool','Byte','Short','Int', 'Long', 'LongLong', 'UByte', 'UShort',
          'UInt', 'ULong', 'ULongLong', 'Float', 'Double', 'LongDouble',
diff --git a/scipy/distutils/command/build_src.py b/scipy/distutils/command/build_src.py
index be515c47e..d64eeaa13 100644
--- a/scipy/distutils/command/build_src.py
+++ b/scipy/distutils/command/build_src.py
@@ -156,6 +156,7 @@ class build_src(build_ext.build_ext):
 
         sources, h_files = self.filter_h_files(sources)
 
+
         for f in h_files:
             self.distribution.headers.append((package,f))
 
diff --git a/scipy/distutils/command/install_headers.py b/scipy/distutils/command/install_headers.py
index 801c1a9d9..043f024f5 100644
--- a/scipy/distutils/command/install_headers.py
+++ b/scipy/distutils/command/install_headers.py
@@ -9,9 +9,14 @@ class install_headers (old_install_headers):
         if not headers:
             return
 
-        prefix = os.path.dirname(self.install_dir)        
+        prefix = os.path.dirname(self.install_dir)
         for header in headers:
             if isinstance(header,tuple):
+                # Kind of a hack, but I don't know where else to change this...
+                if header[0] == 'scipy.base':
+                    header = ('scipy', header[1])
+                    if os.path.splitext(header[1])[1] == '.inc':
+                        continue
                 d = os.path.join(*([prefix]+header[0].split('.')))
                 header = header[1]
             else:
diff --git a/scipy/distutils/misc_util.py b/scipy/distutils/misc_util.py
index 6390f965a..6a0d791c5 100644
--- a/scipy/distutils/misc_util.py
+++ b/scipy/distutils/misc_util.py
@@ -390,6 +390,7 @@ class Configuration:
             else:
                 data_dict[d].append(f)
         self.data_files.extend(data_dict.items())
+        print "########## New data files ################", self.data_files
         return            
         
     def add_include_dirs(self,*paths):
diff --git a/scipy/setup.py b/scipy/setup.py
index 432ba21b5..60727543a 100644
--- a/scipy/setup.py
+++ b/scipy/setup.py
@@ -5,6 +5,7 @@ def configuration(parent_package='',top_path=None):
     from scipy.distutils.misc_util import Configuration
     config = Configuration('scipy',parent_package,top_path)
     config.add_subpackage('distutils')
+    config.add_subpackage('test')
     config.add_subpackage('base')
     config.add_subpackage('lib',os.path.join(config.local_path,'corelib'))
     config.add_subpackage('fftpack')
diff --git a/scipy/test/testing.py b/scipy/test/testing.py
index 48752e5b5..01f2246ed 100644
--- a/scipy/test/testing.py
+++ b/scipy/test/testing.py
@@ -791,11 +791,11 @@ def output_exception():
     finally:
         type = value = tb = None # clean up
 
-from scipy_base.numerix import alltrue, equal, shape, ravel, around, zeros,\
+from scipy.base import alltrue, equal, shape, ravel, around, zeros,\
      Float64, asarray, less_equal, array2string, less, ArrayType
 
 try:
-    from scipy_base.numerix import fastumath as math
+    import scipy.base.umath as math
 except ImportError,msg:
     print msg
     import math
diff --git a/weave/setup_weave.py b/weave/setup_weave.py
index 320a69065..972121054 100755
--- a/weave/setup_weave.py
+++ b/weave/setup_weave.py
@@ -13,10 +13,10 @@ def configuration(parent_package='',parent_path=None):
     config.add_subpackage(dot_join(parent_package, 'tests'),test_path)
     scxx_files = glob(os.path.join(local_path,'scxx','*.*'))
     install_path = os.path.join(parent_path,'weave','scxx')
-    config.add_data_dir(os.path.join(local_path,'scxx'))
-    config.add_data_dir(os.path.join(local_path,'blitz','blitz'))
-    config.add_data_dir(os.path.join(local_path,'blitz','blitz','array'))
-    config.add_data_dir(os.path.join(local_path,'blitz','blitz','meta'))
+    config.add_data_dir('scxx')
+    config.add_data_dir(os.path.join('blitz','blitz'))
+    config.add_data_dir(os.path.join('blitz','blitz','array'))
+    config.add_data_dir(os.path.join('blitz','blitz','meta'))
     config.add_data_files(*glob(os.path.join(local_path,'doc','*.html')))
     config.add_data_files(*glob(os.path.join(local_path,'examples','*.py')))    
     return config