Author: dmeyer
Date: Fri Mar 10 18:41:12 2006
New Revision: 1264
Modified:
trunk/base/src/base/distribution.py
trunk/display/setup.py
Log:
fix stupid bug when using the global setup.py
Modified: trunk/base/src/base/distribution.py
==============================================================================
--- trunk/base/src/base/distribution.py (original)
+++ trunk/base/src/base/distribution.py Fri Mar 10 18:41:12 2006
@@ -39,7 +39,6 @@
from version import Version
_libraries = []
-_modules = []
class Library(object):
def __init__(self, name):
@@ -212,12 +211,6 @@
return False
- def build(self):
- """
- """
- _modules.append(self)
-
-
def check_library(self, name, minver):
"""
Check dependencies add add the flags to include_dirs, library_dirs and
@@ -331,9 +324,6 @@
del kwargs['module']
# convert Extensions
- if not kwargs.has_key('ext_modules'):
- kwargs['ext_modules'] = _modules
-
if kwargs.has_key('ext_modules'):
kaa_ext_modules = kwargs['ext_modules']
ext_modules = []
Modified: trunk/display/setup.py
==============================================================================
--- trunk/display/setup.py (original)
+++ trunk/display/setup.py Fri Mar 10 18:41:12 2006
@@ -107,6 +107,9 @@
os.unlink(out)
+# extention modules
+modules = []
+
if get_library('X11'):
# the display so module
@@ -131,7 +134,7 @@
features = [ 'yes' ]
else:
print "+ X11 (%s)" % ', '.join(features)
- x11.build()
+ modules.append(x11)
else:
print '- X11'
@@ -146,7 +149,7 @@
print "+ Framebuffer (imlib2, evas)"
else:
print "+ Framebuffer (imlib2)"
- fb.build()
+ modules.append(fb)
else:
print "- Framebuffer"
@@ -161,7 +164,7 @@
dfb.add_library('evas')
else:
print "+ DirectFB"
- dfb.build()
+ modules.append(dfb)
else:
print "- DirectFB"
@@ -173,7 +176,7 @@
sdl.add_library('imlib2')
sdl.add_library('sdl')
sdl.include_dirs.append(pygame)
- sdl.build()
+ modules.append(sdl)
print "+ SDL (imlib2)"
else:
print "- SDL"
@@ -181,6 +184,7 @@
setup(module = 'display',
version = '0.1',
+ ext_modules = modules
)
config.unlink()
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
