[Numpy-svn] r4079 - in branches/numpy.scons: . numpy/distutils/scons numpy/scons_fake

numpy-svn@scip... numpy-svn@scip...
Sat Sep 22 09:06:48 CDT 2007


Author: cdavid
Date: 2007-09-22 09:06:28 -0500 (Sat, 22 Sep 2007)
New Revision: 4079

Modified:
   branches/numpy.scons/
   branches/numpy.scons/numpy/distutils/scons/__init__.py
   branches/numpy.scons/numpy/scons_fake/__init__.py
Log:
Specific prefix for ctypes shared libraries


Property changes on: branches/numpy.scons
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-09-22 20:37:08.022000074 +0900
committer: david <david@david-laptop>
properties: 
	branch-nick: numpy.scons

   + timestamp: 2007-09-22 23:05:34.460999966 +0900
committer: david <david@david-laptop>
properties: 
	branch-nick: numpy.scons

Name: bzr:file-ids
   - numpy/scons_fake/__init__.py	__init__.py-20070922113634-7m61zd3x0182bwro-1
numpy/distutils/scons/__init__.py	__init__.py-20070922113607-9hdtgj7ooqldhu4w-1

   + 
Name: bzr:revision-id:v3-trunk0
   - 3737 david@david-laptop-20070920080908-n8pj8vmszdir3zoa
3738 david@david-laptop-20070920081509-58kkojgmml3t7jxs
3739 david@david-laptop-20070920081910-phlk1ujthksgpm0z
3740 david@david-laptop-20070920082641-bdhrt6eafeoli50i
3741 david@ar.media.kyoto-u.ac.jp-20070920130730-satdeppbh1k0bq2p
3743 david@ar.media.kyoto-u.ac.jp-20070921073742-vpv8pwv0j8fbd93m
3744 david@david-laptop-20070922101656-61kfi2faucemr2rl
3745 david@david-laptop-20070922113708-ror18thshang1cpu

   + 3737 david@david-laptop-20070920080908-n8pj8vmszdir3zoa
3738 david@david-laptop-20070920081509-58kkojgmml3t7jxs
3739 david@david-laptop-20070920081910-phlk1ujthksgpm0z
3740 david@david-laptop-20070920082641-bdhrt6eafeoli50i
3741 david@ar.media.kyoto-u.ac.jp-20070920130730-satdeppbh1k0bq2p
3743 david@ar.media.kyoto-u.ac.jp-20070921073742-vpv8pwv0j8fbd93m
3744 david@david-laptop-20070922101656-61kfi2faucemr2rl
3745 david@david-laptop-20070922113708-ror18thshang1cpu
3747 david@david-laptop-20070922140534-n9xsl096tjrzmct1


Modified: branches/numpy.scons/numpy/distutils/scons/__init__.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/__init__.py	2007-09-22 13:47:45 UTC (rev 4078)
+++ branches/numpy.scons/numpy/distutils/scons/__init__.py	2007-09-22 14:06:28 UTC (rev 4079)
@@ -18,12 +18,12 @@
 def NumpyCTypes(env, target, source, *args, **kw):
     source = [pjoin(env['build_dir'], i) for i in source]
     # XXX: why target is a list ? It is always true ?
-    lib = env.SharedLibrary("$build_dir/%s" % target[0], source, *args, **kw)
+    # XXX: handle cases where SHLIBPREFIX is in args
+    lib = env.SharedLibrary("$build_dir/%s" % target[0], source, SHLIBPREFIX = '', *args, **kw)
     lib = [i for i in lib if not (str(i).endswith('.exp') or str(i).endswith('.lib')) ]
     inst_lib = env.Install("$distutils_installdir", lib)
     return lib, inst_lib
 
-
 def GetNumpyOptions(args):
     """Call this with args=ARGUMENTS to take into account command line args."""
     opts = Options(None, args)

Modified: branches/numpy.scons/numpy/scons_fake/__init__.py
===================================================================
--- branches/numpy.scons/numpy/scons_fake/__init__.py	2007-09-22 13:47:45 UTC (rev 4078)
+++ branches/numpy.scons/numpy/scons_fake/__init__.py	2007-09-22 14:06:28 UTC (rev 4079)
@@ -1,6 +1,6 @@
 from numpy.ctypeslib import load_library
 
-_FOO = load_library("foo.dll", __file__)
+_FOO = load_library("foo", __file__)
 def foo():
     _FOO.foo()
     



More information about the Numpy-svn mailing list