[PyObjC-svn] r2258 - in trunk/pyobjc/pyobjc-core: . PyObjCTest

Author: ronaldoussoren
Date: Mon Jun  1 05:11:05 2009
New Revision: 2258

Log:
Fix issues introduced by previous checkins.


Modified:
   trunk/pyobjc/pyobjc-core/PyObjCTest/test_blocks.py
   trunk/pyobjc/pyobjc-core/setup.py

Modified: trunk/pyobjc/pyobjc-core/PyObjCTest/test_blocks.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/PyObjCTest/test_blocks.py	(original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_blocks.py	Mon Jun  1 05:11:05 2009
@@ -41,6 +41,7 @@
 
 
 class TestBlocks (TestCase):
+    @min_os_level('10.6')
     def testBlockToObjC(self):
         obj = OCTestBlock.alloc().init()
 	
@@ -55,6 +56,7 @@
 
 	self.failUnlessEqual(lst, [42, 43])
 
+    @min_os_level('10.6')
     def testBlockToObjC2(self):
         obj = OCTestBlock.alloc().init()
 	
@@ -66,6 +68,7 @@
 	self.failUnlessEqual(obj.callDoubleBlock_withValue_andValue_(callback, 2.5, 10), 25.0)
 
 
+    @min_os_level('10.6')
     def testBlockFromObjC(self):
         obj = OCTestBlock.alloc().init()
 
@@ -76,6 +79,7 @@
         value = block()
         self.failUnlessEqual(value, 42)
 
+    @min_os_level('10.6')
     def testBlockFromObjC2(self):
         obj = OCTestBlock.alloc().init()
 

Modified: trunk/pyobjc/pyobjc-core/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/setup.py	(original)
+++ trunk/pyobjc/pyobjc-core/setup.py	Mon Jun  1 05:11:05 2009
@@ -24,6 +24,7 @@
     vstr = '.'.join(map(str, MIN_PYTHON))
     raise SystemExit('PyObjC: Need at least Python ' + vstr)
 
+USE_SYSTEM_FFI = False
 if int(os.uname()[2].split('.')[0]) >= 10:
 	USE_SYSTEM_FFI = True
 
@@ -146,6 +147,7 @@
 # The following flags are an attempt at getting rid of /usr/local
 # in the compiler search path.
     "-DPyObjC_STRICT_DEBUGGING",
+    "-DMACOSX", # For libffi
     "-DPyObjC_BUILD_RELEASE=%02d%02d"%(tuple(map(int, platform.mac_ver()[0].split('.')[:2]))),
     "-no-cpp-precomp",
     #"-Wno-long-double",

------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT 
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, & 
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian 
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com