[Numpy-svn] r4687 - branches/build_with_scons/numpy/distutils/command

numpy-svn@scip... numpy-svn@scip...
Sun Jan 6 06:11:54 CST 2008


Author: cdavid
Date: 2008-01-06 06:11:48 -0600 (Sun, 06 Jan 2008)
New Revision: 4687

Modified:
   branches/build_with_scons/numpy/distutils/command/scons.py
Log:

Define various scons related functions to call numscons instead of being
defined directly in numpy, for bootstrapping issues.



Modified: branches/build_with_scons/numpy/distutils/command/scons.py
===================================================================
--- branches/build_with_scons/numpy/distutils/command/scons.py	2008-01-06 10:49:23 UTC (rev 4686)
+++ branches/build_with_scons/numpy/distutils/command/scons.py	2008-01-06 12:11:48 UTC (rev 4687)
@@ -16,19 +16,22 @@
     """Return the top path where everything produced by scons will be put.
     
     The path is relative to the top setup.py"""
-    return os.path.join('build', 'scons')
+    from numscons import get_scons_build_dir
+    return get_scons_build_dir()
 
 def get_scons_configres_dir():
     """Return the top path where everything produced by scons will be put.
     
     The path is relative to the top setup.py"""
-    return os.path.join('build', 'scons-configres')
+    from numscons import get_scons_configres_dir
+    return get_scons_configres_dir()
 
 def get_scons_configres_filename():
     """Return the top path where everything produced by scons will be put.
     
     The path is relative to the top setup.py"""
-    return '__configres.py'
+    from numscons import get_scons_configres_filename
+    return get_scons_configres_filename()
 
 def get_scons_local_path():
     """This returns the full path where scons.py for scons-local is located."""



More information about the Numpy-svn mailing list