[Numpy-svn] r4162 - in branches/numpy.scons: . numpy/scons_fake numpy/scons_fake/ctypesext numpy/scons_fake/pyext

Tue Oct 9 19:17:31 EDT 2007

Author: cdavid
Date: 2007-10-09 18:17:14 -0500 (Tue, 09 Oct 2007)
New Revision: 4162

Added:
   branches/numpy.scons/numpy/scons_fake/pyext/SConstruct
   branches/numpy.scons/numpy/scons_fake/pyext/setup.py
   branches/numpy.scons/numpy/scons_fake/setup.py
Modified:
   branches/numpy.scons/
   branches/numpy.scons/numpy/scons_fake/ctypesext/SConstruct
   branches/numpy.scons/numpy/scons_fake/ctypesext/setup.py
Log:
Finish the split of scons_fake into two packages



Property changes on: branches/numpy.scons
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-10-10 07:31:02.891999960 +0900
committer: david <david at david-laptop>
properties: 
	branch-nick: numpy.scons

   + timestamp: 2007-10-10 07:52:59.790999889 +0900
committer: david <david at david-laptop>
properties: 
	branch-nick: numpy.scons

Name: bzr:file-ids
   - numpy/scons_fake/ctypesext	numpyscons_fakectype-20071009222126-tpzs2312hkp03hcu-1
numpy/scons_fake/ctypesext/__init__.py	__init__.py-20070922113634-7m61zd3x0182bwro-1
numpy/scons_fake/ctypesext/foo.c	foo.c-20070920125943-f6sf0rnbhik75mtj-1
numpy/scons_fake/ctypesext/SConstruct	sconstruct-20070920125938-jw3np1dk1gtr5a4s-1
numpy/scons_fake/ctypesext/setup.py	setup.py-20070920081521-unftng09muypbx5t-2
numpy/scons_fake/ctypesext/foo_py.py	foo_py.py-20070924164547-m01dunwfr91x9rg1-1
numpy/scons_fake/ctypesext/tests	numpyscons_fakectype-20071009222215-v9ksajiiyzlhsmmp-1
numpy/scons_fake/ctypesext/tests/test_foo_py.py	test_foo_py.py-20070924163456-f1o01h1eksm5bevu-2
numpy/scons_fake/pyext	numpyscons_fakepyext-20071009222120-mfloawjkwdaonpel-1
numpy/scons_fake/pyext/hellomodule.c	hellomodule.c-20071009151603-naqbhw7952s3b5pl-1
numpy/scons_fake/pyext/tests	tests-20070924163456-f1o01h1eksm5bevu-1
numpy/scons_fake/pyext/tests/test_spam.py	test_spam.py-20071009151607-wobzeu6ne1916j3p-1

   + numpy/scons_fake/setup.py	setup.py-20071009225234-65q3519bx0wvuhyp-1
numpy/scons_fake/pyext/SConstruct	sconstruct-20071009225241-1u6tr190flp1g15l-1
numpy/scons_fake/pyext/setup.py	setup.py-20071009225238-6cteldy08e4udc0o-1

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

   + 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


Modified: branches/numpy.scons/numpy/scons_fake/ctypesext/SConstruct
===================================================================

--- branches/numpy.scons/numpy/scons_fake/ctypesext/SConstruct	2007-10-09 23:16:37 UTC (rev 4161)
+++ branches/numpy.scons/numpy/scons_fake/ctypesext/SConstruct	2007-10-09 23:17:14 UTC (rev 4162)
@@ -3,15 +3,7 @@
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
-config = env.Configure(custom_tests = {'NumpyCheckLib' : NumpyCheckLib})
-config.CheckHeader('stdio.h')
-config.CheckLib('c', 'printf')
-config.NumpyCheckLib(libs = 'sndfile', symbols = 'sf_open', section = 'sndfile')
-config.Finish()
-
-source = ['foo.c']
 import sys
 if sys.platform == 'win32':
     env.AppendUnique(CPPDEFINES = 'WIN32')
-env.NumpyCtypes('foo', source)
-env.NumpyPythonExtension('spam', 'hellomodule.c')
+env.NumpyCtypes('foo', source = ['foo.c'])

Modified: branches/numpy.scons/numpy/scons_fake/ctypesext/setup.py
===================================================================
--- branches/numpy.scons/numpy/scons_fake/ctypesext/setup.py	2007-10-09 23:16:37 UTC (rev 4161)
+++ branches/numpy.scons/numpy/scons_fake/ctypesext/setup.py	2007-10-09 23:17:14 UTC (rev 4162)
@@ -1,40 +1,10 @@
 import os
 import os.path
 
-def get_object_names(source_filenames, strip_dir=0, output_dir=''):
-    # ripped off distutilc.ccompiler (CCompiler_object_filenames)
-    if output_dir is None:
-        output_dir = ''
-    obj_names = []
-    for src_name in source_filenames:
-        base, ext = os.path.splitext(os.path.normpath(src_name))
-        base = os.path.splitdrive(base)[1] # Chop off the drive
-        base = base[os.path.isabs(base):]  # If abs, chop off leading /
-        if base.startswith('..'):
-            # Resolve starting relative path components, middle ones
-            # (if any) have been handled by os.path.normpath above.
-            i = base.rfind('..')+2
-            d = base[:i]
-            d = os.path.basename(os.path.abspath(d))
-            base = d + base[i:]
-        #XXX: how to know which file types are supported ?
-        #if ext not in self.src_extensions:
-        #    raise UnknownFileError, \
-        #          "unknown file type '%s' (from '%s')" % (ext, src_name)
-        if strip_dir:
-            base = os.path.basename(base)
-        #XXX: change '.o' to something like obj_extension 
-        obj_name = os.path.join(output_dir,base + '.o')
-        obj_names.append(obj_name)
-    return obj_names
-
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
-    from numpy.distutils.system_info import get_info
-    config = Configuration('scons_fake',parent_package,top_path)
+    config = Configuration('ctypesext',parent_package,top_path)
 
-    #config.add_library('_fortran_foo',
-    #                   sources=['foo.f'])
     config.add_sconscript('SConstruct')
     config.add_data_dir('tests')
     return config

Added: branches/numpy.scons/numpy/scons_fake/pyext/SConstruct
===================================================================
--- branches/numpy.scons/numpy/scons_fake/pyext/SConstruct	2007-10-09 23:16:37 UTC (rev 4161)
+++ branches/numpy.scons/numpy/scons_fake/pyext/SConstruct	2007-10-09 23:17:14 UTC (rev 4162)
@@ -0,0 +1,6 @@
+# vim:syntax=python
+from numpy.distutils.scons import GetNumpyEnvironment
+
+env = GetNumpyEnvironment(ARGUMENTS)
+
+env.NumpyPythonExtension('spam', source = ['hellomodule.c'])

Added: branches/numpy.scons/numpy/scons_fake/pyext/setup.py
===================================================================
--- branches/numpy.scons/numpy/scons_fake/pyext/setup.py	2007-10-09 23:16:37 UTC (rev 4161)
+++ branches/numpy.scons/numpy/scons_fake/pyext/setup.py	2007-10-09 23:17:14 UTC (rev 4162)
@@ -0,0 +1,14 @@
+import os
+import os.path
+
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('pyext',parent_package,top_path)
+
+    config.add_sconscript('SConstruct')
+    config.add_data_dir('tests')
+    return config
+
+if __name__ == '__main__':
+    from numpy.distutils.core import setup
+    setup(configuration=configuration)

Added: branches/numpy.scons/numpy/scons_fake/setup.py
===================================================================
--- branches/numpy.scons/numpy/scons_fake/setup.py	2007-10-09 23:16:37 UTC (rev 4161)
+++ branches/numpy.scons/numpy/scons_fake/setup.py	2007-10-09 23:17:14 UTC (rev 4162)
@@ -0,0 +1,14 @@
+import os
+import os.path
+
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('scons_fake',parent_package,top_path)
+
+    config.add_subpackage('pyext')
+    config.add_subpackage('ctypesext')
+    return config
+
+if __name__ == '__main__':
+    from numpy.distutils.core import setup
+    setup(configuration=configuration)


