[Numpy-svn] r4176 - in branches/numpy.scons: . numpy/distutils/command
numpy-svn at scipy.org
numpy-svn at scipy.org
Fri Oct 12 02:53:08 EDT 2007
Author: cdavid
Date: 2007-10-12 01:51:56 -0500 (Fri, 12 Oct 2007)
New Revision: 4176
Modified:
branches/numpy.scons/
branches/numpy.scons/numpy/distutils/command/scons.py
Log:
Minor cleanup of scons command
Property changes on: branches/numpy.scons
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2007-10-11 16:12:51.690999985 +0900
committer: David Cournapeau <david at ar.media.kyoto-u.ac.jp>
properties:
branch-nick: numpy.scons
+ timestamp: 2007-10-12 13:03:23.233999968 +0900
committer: David Cournapeau <david at ar.media.kyoto-u.ac.jp>
properties:
branch-nick: numpy.scons
Name: bzr:revision-id:v3-trunk0
- 3737 david at david-laptop-20070920080908-n8pj8vmszdir3zoa
3738 david at david-laptop-20070920081509-58kkojgmml3t7jxs
3739 david at david-laptop-20070920081910-phlk1ujthksgpm0z
3740 david at david-laptop-20070920082641-bdhrt6eafeoli50i
3741 david at ar.media.kyoto-u.ac.jp-20070920130730-satdeppbh1k0bq2p
3743 david at ar.media.kyoto-u.ac.jp-20070921073742-vpv8pwv0j8fbd93m
3744 david at david-laptop-20070922101656-61kfi2faucemr2rl
3745 david at david-laptop-20070922113708-ror18thshang1cpu
3747 david at david-laptop-20070922140534-n9xsl096tjrzmct1
3749 david at david-laptop-20070922154007-usit009fr6vp377j
3750 david at david-laptop-20070923070011-leu2ozc2fy1q5cht
3751 david at david-laptop-20070924015925-dhsiao40jp7zsfp9
3752 david at ar.media.kyoto-u.ac.jp-20070924070657-nbw23j0ayan30cli
3753 david at ar.media.kyoto-u.ac.jp-20070924082918-i1lc1zikywi8czj4
3754 david at ar.media.kyoto-u.ac.jp-20070924083008-c0edtt8zs31yeh1q
3755 david at ar.media.kyoto-u.ac.jp-20070924112351-pnnho638cohz6lj1
3756 david at david-laptop-20070924153247-yftud00bynilxv69
3757 david at david-laptop-20070924163545-pish34x9fq2h66aj
3758 david at david-laptop-20070924164633-iiyygcaw81ji3n34
3759 david at david-laptop-20070924170201-y14v2yzikdpvamfp
3760 david at david-laptop-20070924171208-5bmitorzf49d1aa2
3761 david at david-laptop-20070925014444-ns9v90gotnxt39mq
3769 david at david-laptop-20070925145952-4osi81tvch7v6luj
3773 david at ar.media.kyoto-u.ac.jp-20070926073429-2kdc6yf1o210aer0
3774 david at ar.media.kyoto-u.ac.jp-20070926084356-938djoytjap90rmo
3775 david at ar.media.kyoto-u.ac.jp-20070926085329-3gquq3gu2k8rgzb0
3776 david at ar.media.kyoto-u.ac.jp-20071009084906-9kradhwpu7su633x
3777 david at ar.media.kyoto-u.ac.jp-20071009093339-q5nf5me6ikdi48k6
3778 david at david-laptop-20071009152108-xh5cltii0h6zjk9b
3779 david at david-laptop-20071009154954-v5se05gbq60opo1z
3780 david at david-laptop-20071009223102-vz2sgf5i6pncxsd8
3781 david at david-laptop-20071009225259-13m6enwqk4w9uihe
3782 david at ar.media.kyoto-u.ac.jp-20071010021710-liz2jvw0ggbxrtgi
3783 david at ar.media.kyoto-u.ac.jp-20071010032218-8qzxvdmith85a056
3784 david at ar.media.kyoto-u.ac.jp-20071010032323-lgbxfd788h402kn0
3792 david at ar.media.kyoto-u.ac.jp-20071011033223-s14976refgeaw00h
3793 david at ar.media.kyoto-u.ac.jp-20071011033241-rrzlo2vu6w0tkdwf
3794 david at ar.media.kyoto-u.ac.jp-20071011071251-c5pxigyynpck262d
+ 3737 david at david-laptop-20070920080908-n8pj8vmszdir3zoa
3738 david at david-laptop-20070920081509-58kkojgmml3t7jxs
3739 david at david-laptop-20070920081910-phlk1ujthksgpm0z
3740 david at david-laptop-20070920082641-bdhrt6eafeoli50i
3741 david at ar.media.kyoto-u.ac.jp-20070920130730-satdeppbh1k0bq2p
3743 david at ar.media.kyoto-u.ac.jp-20070921073742-vpv8pwv0j8fbd93m
3744 david at david-laptop-20070922101656-61kfi2faucemr2rl
3745 david at david-laptop-20070922113708-ror18thshang1cpu
3747 david at david-laptop-20070922140534-n9xsl096tjrzmct1
3749 david at david-laptop-20070922154007-usit009fr6vp377j
3750 david at david-laptop-20070923070011-leu2ozc2fy1q5cht
3751 david at david-laptop-20070924015925-dhsiao40jp7zsfp9
3752 david at ar.media.kyoto-u.ac.jp-20070924070657-nbw23j0ayan30cli
3753 david at ar.media.kyoto-u.ac.jp-20070924082918-i1lc1zikywi8czj4
3754 david at ar.media.kyoto-u.ac.jp-20070924083008-c0edtt8zs31yeh1q
3755 david at ar.media.kyoto-u.ac.jp-20070924112351-pnnho638cohz6lj1
3756 david at david-laptop-20070924153247-yftud00bynilxv69
3757 david at david-laptop-20070924163545-pish34x9fq2h66aj
3758 david at david-laptop-20070924164633-iiyygcaw81ji3n34
3759 david at david-laptop-20070924170201-y14v2yzikdpvamfp
3760 david at david-laptop-20070924171208-5bmitorzf49d1aa2
3761 david at david-laptop-20070925014444-ns9v90gotnxt39mq
3769 david at david-laptop-20070925145952-4osi81tvch7v6luj
3773 david at ar.media.kyoto-u.ac.jp-20070926073429-2kdc6yf1o210aer0
3774 david at ar.media.kyoto-u.ac.jp-20070926084356-938djoytjap90rmo
3775 david at ar.media.kyoto-u.ac.jp-20070926085329-3gquq3gu2k8rgzb0
3776 david at ar.media.kyoto-u.ac.jp-20071009084906-9kradhwpu7su633x
3777 david at ar.media.kyoto-u.ac.jp-20071009093339-q5nf5me6ikdi48k6
3778 david at david-laptop-20071009152108-xh5cltii0h6zjk9b
3779 david at david-laptop-20071009154954-v5se05gbq60opo1z
3780 david at david-laptop-20071009223102-vz2sgf5i6pncxsd8
3781 david at david-laptop-20071009225259-13m6enwqk4w9uihe
3782 david at ar.media.kyoto-u.ac.jp-20071010021710-liz2jvw0ggbxrtgi
3783 david at ar.media.kyoto-u.ac.jp-20071010032218-8qzxvdmith85a056
3784 david at ar.media.kyoto-u.ac.jp-20071010032323-lgbxfd788h402kn0
3792 david at ar.media.kyoto-u.ac.jp-20071011033223-s14976refgeaw00h
3793 david at ar.media.kyoto-u.ac.jp-20071011033241-rrzlo2vu6w0tkdwf
3794 david at ar.media.kyoto-u.ac.jp-20071011071251-c5pxigyynpck262d
3795 david at ar.media.kyoto-u.ac.jp-20071012040323-8ka0mgkx1t8r9fcl
Modified: branches/numpy.scons/numpy/distutils/command/scons.py
===================================================================
--- branches/numpy.scons/numpy/distutils/command/scons.py 2007-10-11 09:29:06 UTC (rev 4175)
+++ branches/numpy.scons/numpy/distutils/command/scons.py 2007-10-12 06:51:56 UTC (rev 4176)
@@ -22,12 +22,7 @@
# take into accound os.environ. This actually also works for my way of
# using "local python", using the alias facility of bash.
import sys
- #print dir(sys)
return sys.executable
- #try:
- # pypath = os.environ['PYTHONPATH']
- #except KeyError:
- # pypath = None
def dist2sconscc(compiler):
"""This converts the name passed to distutils to scons name convention (C
@@ -74,7 +69,7 @@
"""Convert path (given as a string) to something the shell will have no
problem to understand (space, etc... problems)."""
# XXX: to this correctly, this is totally bogus for now (does not check for
- # already quoted path, for example.
+ # already quoted path, for example).
return '"' + path + '"'
class scons(old_build_ext):
@@ -93,7 +88,7 @@
def finalize_options(self):
old_build_ext.finalize_options(self)
if self.distribution.has_scons_scripts():
- print "Got it: scons scripts are %s" % self.distribution.scons_scripts
+ #print "Got it: scons scripts are %s" % self.distribution.scons_scripts
self.scons_scripts = self.distribution.scons_scripts
else:
self.scons_scripts = []
@@ -106,7 +101,6 @@
# full path, and add the path to the env['PATH'] variable in env
# instance (this is done in numpy.distutils.scons module).
compiler_type = self.compiler
- print compiler_type
from distutils.ccompiler import new_compiler
self.compiler = new_compiler(compiler=compiler_type,
verbose=self.verbose,
@@ -114,23 +108,10 @@
force=self.force)
self.compiler.customize(self.distribution)
- # This initialization seems necessary, sometimes, for find_executable to work...
+ # This initialization seems necessary, sometimes, for find_executable to work...
if hasattr(self.compiler, 'initialize'):
self.compiler.initialize()
- # XXX: debug, remove
- if self.scons_scripts:
- #print "++++++++++++++++++++++++++++++++++++++++"
- #print "self.compiler is %s, this gives us scons tool %s" % (compiler_type,
- # dist2sconscc(self.compiler))
- #print get_tool_path(self.compiler)
- #print "++++++++++++++++++++++++++++++++++++++++"
-
- print "++++++++++++++++++++++++++++++++++++++++"
- print get_scons_local_path()
- print get_python_exec_invoc()
- print "++++++++++++++++++++++++++++++++++++++++"
-
def run(self):
# XXX: when a scons script is missing, scons only prints warnings, and
# does not return a failure (status is 0). We have to detect this from
@@ -143,7 +124,7 @@
scons_exec = get_python_exec_invoc()
scons_exec += ' ' + protect_path(pjoin(get_scons_local_path(), 'scons.py'))
for i in self.scons_scripts:
- cmd = scons_exec + " -f " + i + ' -I. '
+ cmd = scons_exec + " -Q -f " + i + ' -I. '
cmd += ' src_dir="%s" ' % pdirname(i)
cmd += ' distutils_libdir=%s ' % protect_path(pjoin(self.build_lib, pdirname(i)))
cmd += ' cc_opt=%s ' % dist2sconscc(self.compiler)
More information about the Numpy-svn
mailing list