[PyObjC-svn] r2351 - in trunk/pyobjc/pyobjc-framework-Quartz: . Modules PyObjCTest

Author: ronaldoussoren
Date: Tue Nov 24 08:39:42 2009
New Revision: 2351

Log:
* Bump version to 2.2
* Use pyobjc_setup
* Nasty hack to avoid crash in tests


Modified:
   trunk/pyobjc/pyobjc-framework-Quartz/Modules/_CVPixelBuffer.m
   trunk/pyobjc/pyobjc-framework-Quartz/Modules/_coregraphics.m
   trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cgdataprovider.py
   trunk/pyobjc/pyobjc-framework-Quartz/pyobjc_setup.py   (props changed)
   trunk/pyobjc/pyobjc-framework-Quartz/setup.py

Modified: trunk/pyobjc/pyobjc-framework-Quartz/Modules/_CVPixelBuffer.m
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/Modules/_CVPixelBuffer.m	(original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/Modules/_CVPixelBuffer.m	Tue Nov 24 08:39:42 2009
@@ -5,6 +5,7 @@
 #include "pyobjc-api.h"
 
 #if PyObjC_BUILD_RELEASE >= 1005
+  /* WITH_COREVIDEO  */
 
 #import <CoreVideo/CoreVideo.h>
 

Modified: trunk/pyobjc/pyobjc-framework-Quartz/Modules/_coregraphics.m
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/Modules/_coregraphics.m	(original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/Modules/_coregraphics.m	Tue Nov 24 08:39:42 2009
@@ -250,7 +250,7 @@
 	CFRelease(image);
 	return rv;
 }
-#endif 
+#endif /* PyObjC_BUILD_RELEASE >= 1005*/
 
 static PyObject*
 m_CGBitmapContextCreate(PyObject* self __attribute__((__unused__)), 
@@ -361,7 +361,7 @@
 		METH_VARARGS,
 		NULL
 	},
-#endif 
+#endif /* PyObjC_BUILD_RELEASE >= 1005 */
 	{
 		"CGBitmapContextCreate",
 		(PyCFunction)m_CGBitmapContextCreate,

Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cgdataprovider.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cgdataprovider.py	(original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cgdataprovider.py	Tue Nov 24 08:39:42 2009
@@ -30,6 +30,7 @@
             info[-1] = True
         provider = CGDataProviderCreateWithData(info, info[0], len(info[0]), release)
         self.failUnlessIsInstance(provider, CGDataProviderRef)
+        print
         del provider
 
         self.failUnless(info[-1])

Modified: trunk/pyobjc/pyobjc-framework-Quartz/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/setup.py	(original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/setup.py	Tue Nov 24 08:39:42 2009
@@ -33,41 +33,35 @@
 WARNING: Running the unittests will change your display settings during the
 testrun, which will probably mess up your window layout.
 '''
+
 from pyobjc_setup import setup, Extension
 
+import os
+
 setup(
     name='pyobjc-framework-Quartz',
-    version='2.2b4',
+    version='2.2',
     description = "Wrappers for the Quartz frameworks on Mac OS X",
-    packages = [ "Quartz", 
-        "Quartz.CoreGraphics", "Quartz.ImageIO", "Quartz.QuartzCore", 
-        "Quartz.CoreVideo", "Quartz.QuartzComposer", "Quartz.ImageKit", 
-        "Quartz.PDFKit", "Quartz.QuartzFilters" ],
+    packages = [ "Quartz", "Quartz.CoreGraphics", "Quartz.ImageIO", "Quartz.QuartzCore", "Quartz.CoreVideo", "Quartz.QuartzComposer", "Quartz.ImageKit", "Quartz.PDFKit", "Quartz.QuartzFilters" ],
     install_requires = [ 
-        'pyobjc-core>=2.2b4',
-        'pyobjc-framework-Cocoa>=2.2b4',
+        'pyobjc-core>=2.2',
+        'pyobjc-framework-Cocoa>=2.2',
     ],
     ext_modules = [
         # CoreVideo
         Extension('Quartz.CoreVideo._CVPixelBuffer',
-            [ 'Modules/_CVPixelBuffer.m' ],
-        ),
+            [ 'Modules/_CVPixelBuffer.m' ]),
 
         # CoreGraphics
         Extension('Quartz.CoreGraphics._inlines',
-            [ 'Modules/_CoreGraphics_inlines.m' ],
-        ),
+            [ 'Modules/_CoreGraphics_inlines.m' ]),
         Extension('Quartz.CoreGraphics._callbacks',
-            [ 'Modules/_callbacks.m' ],
-        ),
+            [ 'Modules/_callbacks.m' ]),
         Extension('Quartz.CoreGraphics._doubleindirect',
-            [ 'Modules/_doubleindirect.m' ],
-        ),
+            [ 'Modules/_doubleindirect.m' ]),
         Extension('Quartz.CoreGraphics._sortandmap',
-            [ 'Modules/_sortandmap.m' ],
-        ),
+            [ 'Modules/_sortandmap.m' ]),
         Extension('Quartz.CoreGraphics._coregraphics',
-            [ 'Modules/_coregraphics.m' ],
-        ),
+            [ 'Modules/_coregraphics.m' ]),
     ],
 )

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july