[PyObjC-svn] r2346 - in trunk/pyobjc: pyobjc-core/Lib/PyObjCTools pyobjc-core/Misc pyobjc-framework-AddressBook pyobjc-framework-AppleScriptKit pyobjc-framework-AppleScriptObjC pyobjc-framework-Automator pyobjc-framework-CFNetwork pyobjc-framework-CalendarStore pyobjc-framework-Cocoa pyobjc-framework-Collaboration pyobjc-framework-CoreData pyobjc-framework-CoreData/PyObjCTest pyobjc-framework-CoreLocation pyobjc-framework-CoreText pyobjc-framework-DictionaryServices pyobjc-framework-ExceptionHandling pyobjc-framework-FSEvents pyobjc-framework-InputMethodKit pyobjc-framework-InstallerPlugins pyobjc-framework-InstantMessage pyobjc-framework-InterfaceBuilderKit pyobjc-framework-LatentSemanticMapping pyobjc-framework-LaunchServices pyobjc-framework-Message pyobjc-framework-OpenDirectory pyobjc-framework-PreferencePanes pyobjc-framework-PubSub pyobjc-framework-QTKit p
[email protected] Wed, 14 Oct 2009 01:05:03 -0500
| Newsgroups | gmane.comp.python.pyobjc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: ronaldoussoren
Date: Wed Oct 14 01:05:03 2009
New Revision: 2346
Log:
* This adds a generic "pyobjc_setup.py" file to all framework wrappers,
the implementation is shared between all subprojects and contains all
pyobjc-specific logic. This makes is better than PyObjCTools.DistutilsSupport
because the latter won't work when pyobjc-core is not yet installed
(e.g. when someone tries to install something with an
install_requires=['pyobjc-framework-Cocoa']
in their setup.py
* Most frameworks, except the two big ones: Cocoa and Quartz, now pass
their tests on Tiger.
Added:
trunk/pyobjc/pyobjc-core/Misc/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-AddressBook/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-AppleScriptKit/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-AppleScriptObjC/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-Automator/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-CFNetwork/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-CalendarStore/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-Collaboration/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-CoreData/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-CoreLocation/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-CoreText/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-DictionaryServices/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-ExceptionHandling/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-FSEvents/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-InputMethodKit/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-InstallerPlugins/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-InstantMessage/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-InterfaceBuilderKit/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-LatentSemanticMapping/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-LaunchServices/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-Message/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-OpenDirectory/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-PreferencePanes/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-PubSub/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-QTKit/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-Quartz/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-ScreenSaver/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-ScriptingBridge/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-SearchKit/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-ServerNotification/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-ServiceManagement/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-SyncServices/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-SystemConfiguration/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-WebKit/pyobjc_setup.py
trunk/pyobjc/pyobjc-framework-XgridFoundation/pyobjc_setup.py
Modified:
trunk/pyobjc/pyobjc-core/Lib/PyObjCTools/DistUtilsSupport.py
trunk/pyobjc/pyobjc-framework-AddressBook/setup.py
trunk/pyobjc/pyobjc-framework-AppleScriptKit/setup.py
trunk/pyobjc/pyobjc-framework-AppleScriptObjC/setup.py
trunk/pyobjc/pyobjc-framework-Automator/setup.py
trunk/pyobjc/pyobjc-framework-CFNetwork/setup.py
trunk/pyobjc/pyobjc-framework-CalendarStore/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/setup.py
trunk/pyobjc/pyobjc-framework-Collaboration/setup.py
trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_coredata.py
trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsatomicstore.py
trunk/pyobjc/pyobjc-framework-CoreData/setup.py
trunk/pyobjc/pyobjc-framework-CoreLocation/setup.py
trunk/pyobjc/pyobjc-framework-CoreText/setup.py
trunk/pyobjc/pyobjc-framework-DictionaryServices/setup.py
trunk/pyobjc/pyobjc-framework-ExceptionHandling/setup.py
trunk/pyobjc/pyobjc-framework-FSEvents/setup.py
trunk/pyobjc/pyobjc-framework-InputMethodKit/setup.py
trunk/pyobjc/pyobjc-framework-InstallerPlugins/setup.py
trunk/pyobjc/pyobjc-framework-InstantMessage/setup.py
trunk/pyobjc/pyobjc-framework-InterfaceBuilderKit/setup.py
trunk/pyobjc/pyobjc-framework-LatentSemanticMapping/setup.py
trunk/pyobjc/pyobjc-framework-LaunchServices/setup.py
trunk/pyobjc/pyobjc-framework-Message/setup.py
trunk/pyobjc/pyobjc-framework-OpenDirectory/setup.py
trunk/pyobjc/pyobjc-framework-PreferencePanes/setup.py
trunk/pyobjc/pyobjc-framework-PubSub/setup.py
trunk/pyobjc/pyobjc-framework-QTKit/setup.py
trunk/pyobjc/pyobjc-framework-Quartz/Modules/_CVPixelBuffer.m
trunk/pyobjc/pyobjc-framework-Quartz/Modules/_callbacks.m
trunk/pyobjc/pyobjc-framework-Quartz/Modules/_coregraphics.m
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_IKFilterBrowserPanel.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_IKFilterBrowserView.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_IKImageView.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_camediatiming.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvbase.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvbuffer.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvdisplaylink.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvhosttime.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvimagebuffer.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopenglbuffer.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopenglbufferpool.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopengltexture.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopengltexturecache.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvpixelbuffer.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvpixelbufferpool.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvpixelformatdescription.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvreturn.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikfilterui.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikimagebrowserview.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikimageeditpanel.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikpicturetaker.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikslideshow.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_imagekitdeprecated.py
trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_quartzfilter.py
trunk/pyobjc/pyobjc-framework-Quartz/setup.py
trunk/pyobjc/pyobjc-framework-ScreenSaver/setup.py
trunk/pyobjc/pyobjc-framework-ScriptingBridge/setup.py
trunk/pyobjc/pyobjc-framework-SearchKit/setup.py
trunk/pyobjc/pyobjc-framework-ServerNotification/setup.py
trunk/pyobjc/pyobjc-framework-ServiceManagement/setup.py
trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncchange.py
trunk/pyobjc/pyobjc-framework-SyncServices/setup.py
trunk/pyobjc/pyobjc-framework-SystemConfiguration/PyObjCTest/test_systemconfiguration.py
trunk/pyobjc/pyobjc-framework-SystemConfiguration/setup.py
trunk/pyobjc/pyobjc-framework-WebKit/PyObjCTest/test_carbonutils.py
trunk/pyobjc/pyobjc-framework-WebKit/setup.py
trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgjob.py
trunk/pyobjc/pyobjc-framework-XgridFoundation/setup.py
Modified: trunk/pyobjc/pyobjc-core/Lib/PyObjCTools/DistUtilsSupport.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/Lib/PyObjCTools/DistUtilsSupport.py (original)
+++ trunk/pyobjc/pyobjc-core/Lib/PyObjCTools/DistUtilsSupport.py Wed Oct 14 01:05:03 2009
@@ -3,25 +3,34 @@
wrappers.
"""
__all__ = ('build_cmd_for_min_os_level', 'pyobjc_extra_compile_args')
-from distutils.command.build import build as _build_cmd
+from distutils.core import Command
from distutils.errors import DistutilsPlatformError
import platform
-class build_unsupported (_build_cmd):
+class build_unsupported (Command):
+ user_options = []
+ def initialize_options(self):
+ pass
+ def finalize_options(self):
+ pass
+
def run(self):
raise DistutilsPlatformError(
"Building this distribution is not supported on this version os MacOSX")
-def build_cmd_for_min_os_level(os_level):
+def insert_extra_cmd(extra_cmd, os_level=None):
import platform
+ if os_level is None:
+ return
+
cur_level = '.'.join(platform.mac_ver()[0].split('.')[:2])
if cur_level < os_level:
- return build_unsupported
- else:
- return _build_cmd
-
+ extra_cmd['test'] = build_unsupported
+ extra_cmd['build'] = build_unsupported
+ extra_cmd['install'] = build_unsupported
+ extra_cmd['develop'] = build_unsupported
def pyobjc_extra_compile_args():
cur_level = '.'.join(platform.mac_ver()[0].split('.')[:2])
Modified: trunk/pyobjc/pyobjc-framework-AddressBook/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-AddressBook/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-AddressBook/setup.py Wed Oct 14 01:05:03 2009
@@ -8,37 +8,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-from setuptools import setup
-
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
name='pyobjc-framework-AddressBook',
version="2.2b4",
description = "Wrappers for the framework AddressBook on Mac OS X",
- long_description = __doc__,
- author = 'Ronald Oussoren',
- author_email = '[email protected]',
- url= 'http://pyobjc.sourceforge.net/',
- platforms = [ "MacOS X" ],
packages = [ "AddressBook" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- cmdclass = extra_cmdclass,
- options = extra_options('AddressBook'),
- zip_safe = True,
- test_suite='PyObjCTest',
)
Modified: trunk/pyobjc/pyobjc-framework-AppleScriptKit/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-AppleScriptKit/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-AppleScriptKit/setup.py Wed Oct 14 01:05:03 2009
@@ -6,37 +6,15 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
name='pyobjc-framework-AppleScriptKit',
version='2.2b4',
description = "Wrappers for the framework AppleScriptKit on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "AppleScriptKit" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('AppleScriptKit'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-AppleScriptObjC/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-AppleScriptObjC/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-AppleScriptObjC/setup.py Wed Oct 14 01:05:03 2009
@@ -8,39 +8,17 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
+ min_os_level='10.6',
name='pyobjc-framework-AppleScriptObjC',
version='2.2b4',
description = "Wrappers for the framework AppleScriptObjC on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "AppleScriptObjC" ],
- package_dir = {
- '': 'Lib'
- },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- dependency_links = [],
- package_data = {
- '': ['*.xml']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('AppleScriptObjC'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-Automator/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Automator/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Automator/setup.py Wed Oct 14 01:05:03 2009
@@ -9,36 +9,15 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
name='pyobjc-framework-Automator',
version='2.2b4',
description = "Wrappers for the framework Automator on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "Automator" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('Automator'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/setup.py Wed Oct 14 01:05:03 2009
@@ -12,55 +12,21 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup, Extension
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
-
-import os
-if os.uname()[2] >= '9.':
- CFLAGS=["-isysroot", "/"]
-else:
- CFLAGS=[]
-
-import platform
-CFLAGS.append(
- "-DPyObjC_BUILD_RELEASE=%02d%02d"%(tuple(map(int, platform.mac_ver()[0].split('.')[:2])))
-)
-
+from pyobjc_setup import setup, Extension
setup(
name='pyobjc-framework-CFNetwork',
version='2.2b4',
description = "Wrappers for the framework CFNetwork on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "CFNetwork" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
ext_modules = [
Extension("CFNetwork._manual",
["Modules/_manual.m"],
extra_link_args=['-framework', 'CoreServices'],
- extra_compile_args=CFLAGS,
),
],
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('CFNetwork'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-CalendarStore/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CalendarStore/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-CalendarStore/setup.py Wed Oct 14 01:05:03 2009
@@ -9,36 +9,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
+ min_os_level='10.5',
name='pyobjc-framework-CalendarStore',
version='2.2b4',
description = "Wrappers for the framework CalendarStore on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "CalendarStore" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('CalendarStore'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/setup.py Wed Oct 14 01:05:03 2009
@@ -7,230 +7,128 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup, Extension
-
-from setuptools.command import build_ext, install_lib
-
-import os
-if int(os.uname()[2].split('.')[0]) <= 8:
- CFLAGS=["-DNO_OBJC2_RUNTIME"]
- LDFLAGS=[]
-else:
- CFLAGS=["-isysroot", "/"]
- LDFLAGS=CFLAGS
-
-import platform
-CFLAGS.append(
- "-DPyObjC_BUILD_RELEASE=%02d%02d"%(tuple(map(int, platform.mac_ver()[0].split('.')[:2])))
-)
-
-
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
-
-
-from setuptools.command import build_ext, install_lib
-import os
-
-class pyobjc_install_lib (install_lib.install_lib):
- def get_exclusions(self):
- result = install_lib.install_lib.get_exclusions(self)
- for fn in install_lib._install_lib.get_outputs(self):
- if 'PyObjCTest' in fn:
- result[fn] = 1
-
- return result
-
-class pyobjc_build_ext (build_ext.build_ext):
- def run(self):
- build_ext.build_ext.run(self)
- extensions = self.extensions
- self.extensions = [
- e for e in extensions if e.name.startswith('PyObjCTest') ]
- self.copy_extensions_to_source()
- self.extensions = extensions
-
-extra_cmdclass['build_ext'] = pyobjc_build_ext
-extra_cmdclass['install_lib'] = pyobjc_install_lib
+from pyobjc_setup import setup, Extension
setup(
name='pyobjc-framework-Cocoa',
version='2.2b4',
description = "Wrappers for the Cocoa frameworks on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "Cocoa", "CoreFoundation", "Foundation", "AppKit", "PyObjCTools" ],
namespace_packages = ['PyObjCTools'],
-
- package_dir = { '': 'Lib', 'PyObjCTest': 'PyObjCTest' },
install_requires = [
'pyobjc-core>=2.2b4',
],
- dependency_links = [],
- package_data = {
- '': ['*.bridgesupport']
- },
- zip_safe = False,
- test_suite='PyObjCTest',
-
- cmdclass = extra_cmdclass,
- options = extra_options('Cocoa'),
-
ext_modules = [
# CoreFoundation
Extension('CoreFoundation._inlines',
[ 'Modules/_CoreFoundation_inlines.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFCalendar',
[ 'Modules/_CoreFoundation_CFCalendar.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFTree',
[ 'Modules/_CoreFoundation_CFTree.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFBag',
[ 'Modules/_CoreFoundation_CFBag.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFBinaryHeap',
[ 'Modules/_CoreFoundation_CFBinaryHeap.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS +['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFBitVector',
[ 'Modules/_CoreFoundation_CFBitVector.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFDictionary',
[ 'Modules/_CoreFoundation_CFDictionary.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFFileDescriptor',
[ 'Modules/_CoreFoundation_CFFileDescriptor.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFMachPort',
[ 'Modules/_CoreFoundation_CFMachPort.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFMessagePort',
[ 'Modules/_CoreFoundation_CFMessagePort.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFNumber',
[ 'Modules/_CoreFoundation_CFNumber.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFReadStream',
[ 'Modules/_CoreFoundation_CFReadStream.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFSet',
[ 'Modules/_CoreFoundation_CFSet.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFSocket',
[ 'Modules/_CoreFoundation_CFSocket.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFWriteStream',
[ 'Modules/_CoreFoundation_CFWriteStream.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFRunLoopObserver',
[ 'Modules/_CoreFoundation_CFRunLoopObserver.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFRunLoopSource',
[ 'Modules/_CoreFoundation_CFRunLoopSource.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
Extension('CoreFoundation._CFRunLoopTimer',
[ 'Modules/_CoreFoundation_CFRunLoopTimer.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'CoreFoundation']),
+ extra_link_args=['-framework', 'CoreFoundation']),
# Foundation
Extension('Foundation._nsinvocation',
[ 'Modules/_Foundation_NSInvocation.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'Foundation']),
+ extra_link_args=['-framework', 'Foundation']),
Extension('Foundation._NSDecimal',
[ 'Modules/_Foundation_NSDecimal.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'Foundation']),
+ extra_link_args=['-framework', 'Foundation']),
Extension('Foundation._nscoder',
[ 'Modules/_Foundation_nscoder.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'Foundation']),
+ extra_link_args=['-framework', 'Foundation']),
Extension('Foundation._typecode',
[ 'Modules/_Foundation_typecode.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'Foundation']),
+ extra_link_args=['-framework', 'Foundation']),
Extension('Foundation._inlines',
[ 'Modules/_Foundation_inlines.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'Foundation']),
+ extra_link_args=['-framework', 'Foundation']),
Extension('Foundation._data',
[ 'Modules/_Foundation_data.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'Foundation']),
+ extra_link_args=['-framework', 'Foundation']),
Extension('Foundation._netservice',
[ 'Modules/_Foundation_netservice.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'Foundation']),
+ extra_link_args=['-framework', 'Foundation']),
Extension('Foundation._string',
[ 'Modules/_Foundation_string.m' ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ['-framework', 'Foundation']),
+ extra_link_args=['-framework', 'Foundation']),
# AppKit
Extension("AppKit._inlines",
[ "Modules/_AppKit_inlines.m" ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ["-framework", "AppKit"]),
+ extra_link_args=["-framework", "AppKit"]),
Extension("AppKit._appmain",
[ "Modules/_AppKit_appmain.m" ],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ["-framework", "AppKit"]),
+ extra_link_args=["-framework", "AppKit"]),
Extension("AppKit._nsfont",
[ "Modules/_AppKit_nsfont.m"],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ["-framework", "AppKit"]),
+ extra_link_args=["-framework", "AppKit"]),
Extension("AppKit._nsquickdrawview",
[ "Modules/_AppKit_nsquickdrawview.m"],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ["-framework", "AppKit"]),
+ extra_link_args=["-framework", "AppKit"]),
Extension("AppKit._nsbezierpath",
[ "Modules/_AppKit_nsbezierpath.m"],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ["-framework", "AppKit"]),
+ extra_link_args=["-framework", "AppKit"]),
Extension("AppKit._nsview",
[ "Modules/_AppKit_nsview.m"],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ["-framework", "AppKit"]),
+ extra_link_args=["-framework", "AppKit"]),
Extension("AppKit._nsbitmap",
[ "Modules/_AppKit_nsbitmap.m"],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ["-framework", "AppKit"]),
+ extra_link_args=["-framework", "AppKit"]),
Extension("AppKit._nswindow",
[ "Modules/_AppKit_nswindow.m"],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ["-framework", "AppKit"]),
+ extra_link_args=["-framework", "AppKit"]),
Extension("AppKit._carbon",
[ "Modules/_AppKit_carbon.m"],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ["-framework", "AppKit"]),
+ extra_link_args=["-framework", "AppKit"]),
#
@@ -238,7 +136,6 @@
#
Extension("PyObjCTest.testhelper",
[ "Modules/testhelper.m"],
- extra_compile_args=CFLAGS,
- extra_link_args=CFLAGS + ["-framework", "Foundation"]),
+ extra_link_args=["-framework", "Foundation"]),
],
)
Modified: trunk/pyobjc/pyobjc-framework-Collaboration/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Collaboration/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Collaboration/setup.py Wed Oct 14 01:05:03 2009
@@ -8,36 +8,15 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
-
+from pyobjc_setup import setup
setup(
+ min_os_level='10.5',
name='pyobjc-framework-Collaboration',
version='2.2b4',
description = "Wrappers for the framework Collaboration on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "Collaboration" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('Collaboration'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_coredata.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_coredata.py (original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_coredata.py Wed Oct 14 01:05:03 2009
@@ -7,8 +7,8 @@
class TestCoreData (TestCase):
def testClasses(self):
- self.assert_( hasattr(CoreData, 'NSAtomicStore') )
- self.assert_( isinstance(CoreData.NSAtomicStore, objc.objc_class) )
+ self.assert_( hasattr(CoreData, 'NSAttributeDescription') )
+ self.assert_( isinstance(CoreData.NSAttributeDescription, objc.objc_class) )
def testValues(self):
self.assert_( hasattr(CoreData, 'NSCoreDataVersionNumber10_4_3') )
Modified: trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsatomicstore.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsatomicstore.py (original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsatomicstore.py Wed Oct 14 01:05:03 2009
@@ -4,6 +4,7 @@
class TestNSAtomicStore (TestCase):
+ @min_os_level('10.5')
def testMethods(self):
self.failUnlessArgIsOut(NSAtomicStore.load_, 0)
self.failUnlessArgIsOut(NSAtomicStore.save_, 0)
Modified: trunk/pyobjc/pyobjc-framework-CoreData/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/setup.py Wed Oct 14 01:05:03 2009
@@ -8,36 +8,14 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
-
+from pyobjc_setup import *
setup(
name='pyobjc-framework-CoreData',
version='2.2b4',
description = "Wrappers for the framework CoreData on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "CoreData" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('CoreData'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-CoreLocation/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreLocation/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-CoreLocation/setup.py Wed Oct 14 01:05:03 2009
@@ -8,39 +8,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
+ min_os_level='10.6',
name='pyobjc-framework-CoreLocation',
version='2.2b4',
description = "Wrappers for the framework CoreLocation on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "CoreLocation" ],
- package_dir = {
- '': 'Lib'
- },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- dependency_links = [],
- package_data = {
- '': ['*.xml']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('CoreLocation'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-CoreText/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreText/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-CoreText/setup.py Wed Oct 14 01:05:03 2009
@@ -8,49 +8,23 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup, Extension
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
-
-import os
-if os.uname()[2] > '9.':
- CFLAGS=["-isysroot", "/"]
-else:
- CFLAGS=[]
+from pyobjc_setup import setup, Extension
setup(
+ min_os_level='10.5',
name='pyobjc-framework-CoreText',
version='2.2b4',
description = "Wrappers for the framework CoreText on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "CoreText" ],
- package_dir = { '': 'Lib' },
ext_modules = [
Extension('CoreText._manual',
[ 'Modules/_manual.m' ],
extra_link_args=['-framework', 'CoreServices'],
- extra_compile_args=CFLAGS),
+ ),
],
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
'pyobjc-framework-Quartz>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('CoreText'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-DictionaryServices/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-DictionaryServices/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-DictionaryServices/setup.py Wed Oct 14 01:05:03 2009
@@ -11,36 +11,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
+ min_os_level='10.5',
name='pyobjc-framework-DictionaryServices',
version='2.2b4',
description = "Wrappers for the framework DictionaryServices on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "DictionaryServices" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('DictionaryServices'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-ExceptionHandling/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-ExceptionHandling/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-ExceptionHandling/setup.py Wed Oct 14 01:05:03 2009
@@ -11,37 +11,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
name='pyobjc-framework-ExceptionHandling',
version='2.2b4',
description = "Wrappers for the framework ExceptionHandling on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "PyObjCTools", "ExceptionHandling" ],
namespace_packages = [ "PyObjCTools" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('ExceptionHandling'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-FSEvents/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-FSEvents/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-FSEvents/setup.py Wed Oct 14 01:05:03 2009
@@ -8,47 +8,21 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup, Extension
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
-
-import os
-if os.uname()[2] >= '9.':
- CFLAGS=['-isysroot', '/']
-else:
- CFLAGS=[]
+from pyobjc_setup import setup, Extension
setup(
+ min_os_level='10.5',
name='pyobjc-framework-FSEvents',
version='2.2b4',
description = "Wrappers for the framework FSEvents on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "FSEvents" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('FSEvents'),
ext_modules = [
Extension("FSEvents._callbacks",
[ "Modules/_callbacks.m" ],
- extra_compile_args=CFLAGS),
+ ),
],
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-InputMethodKit/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-InputMethodKit/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-InputMethodKit/setup.py Wed Oct 14 01:05:03 2009
@@ -7,36 +7,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
+ min_os_level='10.5',
name='pyobjc-framework-InputMethodKit',
version='2.2b4',
description = "Wrappers for the framework InputMethodKit on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "InputMethodKit" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4'
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('InputMethodKit'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-InstallerPlugins/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-InstallerPlugins/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-InstallerPlugins/setup.py Wed Oct 14 01:05:03 2009
@@ -9,36 +9,15 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import *
setup(
name='pyobjc-framework-InstallerPlugins',
version='2.2b4',
description = "Wrappers for the framework InstallerPlugins on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "InstallerPlugins" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('InstallerPlugins'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-InstantMessage/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-InstantMessage/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-InstantMessage/setup.py Wed Oct 14 01:05:03 2009
@@ -8,37 +8,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
-
+from pyobjc_setup import setup
setup(
+ min_os_level='10.5',
name='pyobjc-framework-InstantMessage',
version='2.2b4',
description = "Wrappers for the framework InstantMessage on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "InstantMessage" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
'pyobjc-framework-Quartz>=2.2b3',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('InstantMessage'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-InterfaceBuilderKit/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-InterfaceBuilderKit/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-InterfaceBuilderKit/setup.py Wed Oct 14 01:05:03 2009
@@ -20,36 +20,15 @@
This is needed because the InterfaceBuilderKit framework won't load otherwise.
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
-
+from pyobjc_setup import setup
setup(
+ min_os_level='10.5',
name='pyobjc-framework-InterfaceBuilderKit',
version='2.2b4',
description = "Wrappers for the framework InterfaceBuilderKit on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "InterfaceBuilderKit" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('InterfaceBuilderKit'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-LatentSemanticMapping/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-LatentSemanticMapping/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-LatentSemanticMapping/setup.py Wed Oct 14 01:05:03 2009
@@ -11,36 +11,16 @@
NOTE: Apple's documentation for this framework is very minimal at the moment,
making it very hard to actually use the framework.
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
+ min_os_level='10.5',
name='pyobjc-framework-LatentSemanticMapping',
version='2.2b4',
description = "Wrappers for the framework LatentSemanticMapping on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "LatentSemanticMapping" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('LatentSemanticMapping'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-LaunchServices/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-LaunchServices/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-LaunchServices/setup.py Wed Oct 14 01:05:03 2009
@@ -23,36 +23,15 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
name='pyobjc-framework-LaunchServices',
version='2.2b4',
description = "Wrappers for the framework LaunchServices on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "LaunchServices" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('LaunchServices'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-Message/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Message/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Message/setup.py Wed Oct 14 01:05:03 2009
@@ -7,36 +7,14 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
-
+from pyobjc_setup import setup
setup(
name='pyobjc-framework-Message',
version="2.2b4",
description = "Wrappers for the framework Message on Mac OS X",
- long_description = __doc__,
- author = 'Ronald Oussoren',
- author_email = '[email protected]',
- url = 'http://pyobjc.sourceforge.net/',
- platforms = [ "MacOS X" ],
packages = [ "Message" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- cmdclass = extra_cmdclass,
- options = extra_options('Message'),
- test_suite = 'PyObjCTest',
- zip_safe=True,
)
Modified: trunk/pyobjc/pyobjc-framework-OpenDirectory/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-OpenDirectory/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-OpenDirectory/setup.py Wed Oct 14 01:05:03 2009
@@ -7,39 +7,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
+ min_os_level='10.6',
name='pyobjc-framework-OpenDirectory',
version='2.2b4',
description = "Wrappers for the framework OpenDirectory on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "OpenDirectory", "CFOpenDirectory" ],
- package_dir = {
- '': 'Lib'
- },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- dependency_links = [],
- package_data = {
- '': ['*.xml']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('CFOpenDirectory'), #, 'OpenDirectory'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-PreferencePanes/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-PreferencePanes/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-PreferencePanes/setup.py Wed Oct 14 01:05:03 2009
@@ -7,36 +7,14 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
-
+from pyobjc_setup import *
setup(
name='pyobjc-framework-PreferencePanes',
version="2.2b4",
description = "Wrappers for the framework PreferencePanes on Mac OS X",
- long_description = __doc__,
- author = 'Ronald Oussoren',
- author_email = '[email protected]',
- url= 'http://pyobjc.sourceforge.net/',
- platforms = [ "MacOS X" ],
packages = [ "PreferencePanes" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- cmdclass = extra_cmdclass,
- options = extra_options('PreferencePanes'),
- test_suite='PyObjCTest',
- zip_safe=True,
)
Modified: trunk/pyobjc/pyobjc-framework-PubSub/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-PubSub/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-PubSub/setup.py Wed Oct 14 01:05:03 2009
@@ -8,36 +8,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
+ min_os_level='10.5',
name='pyobjc-framework-PubSub',
version='2.2b4',
description = "Wrappers for the framework PubSub on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "PubSub" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('PubSub'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-QTKit/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-QTKit/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-QTKit/setup.py Wed Oct 14 01:05:03 2009
@@ -9,37 +9,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
name='pyobjc-framework-QTKit',
version='2.2b4',
description = "Wrappers for the framework QTKit on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "QTKit" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
'pyobjc-framework-Quartz>=2.2b3',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('QTKit'),
- zip_safe = True,
)
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 Wed Oct 14 01:05:03 2009
@@ -4,7 +4,7 @@
#include <Python.h>
#include "pyobjc-api.h"
-#ifdef WITH_CORE_VIDEO
+#if PyObjC_BUILD_RELEASE >= 1005
#import <CoreVideo/CoreVideo.h>
Modified: trunk/pyobjc/pyobjc-framework-Quartz/Modules/_callbacks.m
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/Modules/_callbacks.m (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/Modules/_callbacks.m Wed Oct 14 01:05:03 2009
@@ -392,7 +392,7 @@
-#ifndef OS_TIGER
+#if PyObjC_BUILD_RELEASE >= 1005
static off_t
m_CGDataProviderSkipForwardCallback(void* _info, off_t count)
@@ -2020,7 +2020,7 @@
doc_CGDataProviderCreateDirectAccess
},
-#ifndef OS_TIGER
+#if PyObjC_BUILD_RELEASE >= 1005
{
"CGDataProviderCreateSequential",
@@ -2116,7 +2116,7 @@
if (PyObjC_ImportAPI(m) < 0) { return; }
-#ifndef OS_TIGER
+#if PyObjC_BUILD_RELEASE >= 1005
if (CGDataProviderCreateSequential == NULL) {
PyDict_DelItemString(md, "CGDataProviderCreateSequential");
}
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 Wed Oct 14 01:05:03 2009
@@ -6,7 +6,7 @@
#import <ApplicationServices/ApplicationServices.h>
-#ifndef OS_TIGER
+#if PyObjC_BUILD_RELEASE >= 1005
static PyObject*
m_CGFontCopyTableTags(PyObject* self __attribute__((__unused__)),
PyObject* args)
@@ -250,7 +250,7 @@
CFRelease(image);
return rv;
}
-#endif /* !OS_TIGER */
+#endif
static PyObject*
m_CGBitmapContextCreate(PyObject* self __attribute__((__unused__)),
@@ -336,7 +336,7 @@
static PyMethodDef m_methods[] = {
-#ifndef OS_TIGER
+#if PyObjC_BUILD_RELEASE >= 1005
{
"CGFontCopyTableTags",
(PyCFunction)m_CGFontCopyTableTags,
@@ -361,7 +361,7 @@
METH_VARARGS,
NULL
},
-#endif /* !OS_TIGER */
+#endif
{
"CGBitmapContextCreate",
(PyCFunction)m_CGBitmapContextCreate,
@@ -378,6 +378,27 @@
{
PyObject* m = Py_InitModule4("_coregraphics", m_methods,
NULL, NULL, PYTHON_API_VERSION);
+#if PyObjC_BUILD_RELEASE >= 1005
+ PyObject* d = PyModule_GetDict(m);
+#endif
if (PyObjC_ImportAPI(m) < 0) { return; }
+
+#if PyObjC_BUILD_RELEASE >= 1005
+ if (CGFontCopyTableTags == NULL) {
+ PyDict_DelItemString(d, "CGFontCopyTableTags");
+ }
+
+ if (CGWindowListCreate == NULL) {
+ PyDict_DelItemString(d, "CGWindowListCreate");
+ }
+
+ if (CGWindowListCreateDescriptionFromArray == NULL) {
+ PyDict_DelItemString(d, "CGWindowListCreateDescriptionFromArray");
+ }
+
+ if (CGWindowListCreateImageFromArray == NULL) {
+ PyDict_DelItemString(d, "CGWindowListCreateImageFromArray");
+ }
+#endif
}
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_IKFilterBrowserPanel.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_IKFilterBrowserPanel.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_IKFilterBrowserPanel.py Wed Oct 14 01:05:03 2009
@@ -1,12 +1,14 @@
from PyObjCTools.TestSupport import *
-from Quartz.ImageKit import *
+from Quartz import *
class TestIKFilterBrowserPanel (TestCase):
+ @min_os_level('10.5')
def testMethods(self):
self.failUnlessArgIsSEL(IKFilterBrowserPanel.beginWithOptions_modelessDelegate_didEndSelector_contextInfo_, 2, "v@:@i^v")
self.failUnlessArgIsSEL(IKFilterBrowserPanel.beginSheetWithOptions_modalForWindow_modalDelegate_didEndSelector_contextInfo_, 3, "v@:@i^v")
+ @min_os_level('10.5')
def testConstants(self):
self.failUnlessIsInstance(IKFilterBrowserFilterSelectedNotification, unicode)
self.failUnlessIsInstance(IKFilterBrowserFilterDoubleClickNotification, unicode)
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_IKFilterBrowserView.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_IKFilterBrowserView.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_IKFilterBrowserView.py Wed Oct 14 01:05:03 2009
@@ -1,8 +1,9 @@
from PyObjCTools.TestSupport import *
-from Quartz.ImageKit import *
+from Quartz import *
class TestIKFilterBrowserView (TestCase):
+ @min_os_level('10.5')
def testMethods(self):
self.failUnlessArgIsBOOL(IKFilterBrowserView.setPreviewState_, 0)
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_IKImageView.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_IKImageView.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_IKImageView.py Wed Oct 14 01:05:03 2009
@@ -1,8 +1,9 @@
from PyObjCTools.TestSupport import *
-from Quartz.ImageKit import *
+from Quartz import *
class TestIKImageView (TestCase):
+ @min_os_level('10.5')
def testConstants(self):
self.failUnlessIsInstance(IKToolModeNone, unicode)
self.failUnlessIsInstance(IKToolModeMove, unicode)
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_camediatiming.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_camediatiming.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_camediatiming.py Wed Oct 14 01:05:03 2009
@@ -2,23 +2,24 @@
from PyObjCTools.TestSupport import *
from Quartz.QuartzCore import *
-class TestCAMediaTimingHelper (NSObject, objc.protocolNamed('CAMediaTiming')):
- def beginTime(self): return 1
- def setBeginTime_(self, v): pass
- def duration(self): return 1
- def setDuration_(self, v): pass
- def speed(self): return 1
- def setSpeed_(self, v): pass
- def timeOffset(self): return 1
- def setTimeOffset_(self, v): pass
- def repeatCount(self): return 1
- def setRepeatCount_(self, v): pass
- def repeatDuration(self): return 1
- def setRepeatDuration_(self, v): pass
- def autoreverses(self): return 1
- def setAutoreverses_(self, v): return 1
- def fillMode(self): return 1
- def setFillMode_(self, v): pass
+if os_release() >= '10.5':
+ class TestCAMediaTimingHelper (NSObject, objc.protocolNamed('CAMediaTiming')):
+ def beginTime(self): return 1
+ def setBeginTime_(self, v): pass
+ def duration(self): return 1
+ def setDuration_(self, v): pass
+ def speed(self): return 1
+ def setSpeed_(self, v): pass
+ def timeOffset(self): return 1
+ def setTimeOffset_(self, v): pass
+ def repeatCount(self): return 1
+ def setRepeatCount_(self, v): pass
+ def repeatDuration(self): return 1
+ def setRepeatDuration_(self, v): pass
+ def autoreverses(self): return 1
+ def setAutoreverses_(self, v): return 1
+ def fillMode(self): return 1
+ def setFillMode_(self, v): pass
class TestCAMediaTiming (TestCase):
def testConstants(self):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvbase.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvbase.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvbase.py Wed Oct 14 01:05:03 2009
@@ -1,5 +1,5 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
+from Quartz import *
class TestCVBase (TestCase):
def testStructs(self):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvbuffer.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvbuffer.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvbuffer.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
+from Quartz import *
class TestCVBuffer (TestCase):
def testConstants(self):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvdisplaylink.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvdisplaylink.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvdisplaylink.py Wed Oct 14 01:05:03 2009
@@ -1,5 +1,4 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
from Quartz import *
class TestCVDisplayLink (TestCase):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvhosttime.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvhosttime.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvhosttime.py Wed Oct 14 01:05:03 2009
@@ -1,5 +1,5 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
+from Quartz import *
class TestCVHostTime (TestCase):
def testFunctions(self):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvimagebuffer.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvimagebuffer.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvimagebuffer.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,5 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
from Quartz import *
class TestCVImageBuffer (TestCase):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopenglbuffer.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopenglbuffer.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopenglbuffer.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
+from Quartz import *
class TestCVOpenGLBuffer (TestCase):
def testConstants(self):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopenglbufferpool.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopenglbufferpool.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopenglbufferpool.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
+from Quartz import *
class TestCVOpenGLBufferPool (TestCase):
def testTypes(self):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopengltexture.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopengltexture.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopengltexture.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
+from Quartz import *
class TestCVOpenGLTexture (TestCase):
def testTypes(self):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopengltexturecache.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopengltexturecache.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvopengltexturecache.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
+from Quartz import *
class TestCVOpenGLTextureCache (TestCase):
def testTypes(self):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvpixelbuffer.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvpixelbuffer.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvpixelbuffer.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
+from Quartz import *
class TestCVPixelBuffer (TestCase):
def testConstants(self):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvpixelbufferpool.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvpixelbufferpool.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvpixelbufferpool.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
+from Quartz import *
class TestCVPixelBufferPool (TestCase):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvpixelformatdescription.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvpixelformatdescription.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvpixelformatdescription.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
+from Quartz import *
class TestCVPixelFormatDescription (TestCase):
def testConstants(self):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvreturn.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvreturn.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_cvreturn.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.CoreVideo import *
+from Quartz import *
class TestCVReturn (TestCase):
def testConstants(self):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikfilterui.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikfilterui.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikfilterui.py Wed Oct 14 01:05:03 2009
@@ -1,8 +1,9 @@
from PyObjCTools.TestSupport import *
-from Quartz.ImageKit import *
+from Quartz import *
class TestIKFilterUI (TestCase):
+ @min_os_level('10.5')
def testConstants(self):
self.failUnlessIsInstance(IKUISizeFlavor, unicode)
self.failUnlessIsInstance(IKUISizeMini, unicode)
@@ -11,6 +12,7 @@
self.failUnlessIsInstance(IKUImaxSize, unicode)
self.failUnlessIsInstance(IKUIFlavorAllowFallback, unicode)
+ @min_os_level('10.5')
def no_testProtocol(self):
self.failUnlessIsInstance(objc.protocolNamed("IKFilterCustomUIProvider"), objc.formal_protocol)
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikimagebrowserview.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikimagebrowserview.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikimagebrowserview.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.ImageKit import *
+from Quartz import *
class TestIKImageBrowserViewHelper (NSObject):
# IKImageBrowserDataSource
@@ -21,6 +21,7 @@
class TestIKImageBrowserView (TestCase):
+ @min_os_level('10.5')
def testProtocols(self):
self.failUnlessIsInstance(protocols.IKImageBrowserDataSource, objc.informal_protocol)
@@ -40,6 +41,7 @@
self.failUnlessArgHasType(TestIKImageBrowserViewHelper.imageBrowser_cellWasDoubleClickedAtIndex_, 1, objc._C_NSUInteger)
self.failUnlessArgHasType(TestIKImageBrowserViewHelper.imageBrowser_cellWasRightClickedAtIndex_withEvent_, 1, objc._C_NSUInteger)
+ @min_os_level('10.5')
def testMethods(self):
self.failUnlessResultIsBOOL(IKImageBrowserView.constrainsToOriginalSize)
self.failUnlessArgIsBOOL(IKImageBrowserView.setConstrainsToOriginalSize_, 0)
@@ -57,6 +59,7 @@
#view = IKImageBrowserView.alloc().init()
#self.failUnlessResultIsBOOL(view.isGroupExpandedAtIndex_)
+ @min_os_level('10.5')
def testConstants(self):
self.failUnlessEqual(IKCellsStyleNone, 0)
self.failUnlessEqual(IKCellsStyleShadowed, 1)
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikimageeditpanel.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikimageeditpanel.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikimageeditpanel.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.ImageKit import *
+from Quartz import *
class TestIKImageEditPanelHelper (NSObject):
def thumbnailWithMaximumSize_(self, sz): return None
@@ -9,9 +9,11 @@
def hasDetailsMode(self): return 1
class TestIKImageEditPanel (TestCase):
+ @min_os_level('10.5')
def no_testProtocols(self):
self.failUnlessIsInstance(objc.protocolNamed('IKImageEditPanel'), objc.formal_protocol)
+ @min_os_level('10.5')
def testProtocolMethods(self):
self.failUnlessArgHasType(TestIKImageEditPanelHelper.thumbnailWithMaximumSize_, 0, NSSize.__typestr__)
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikpicturetaker.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikpicturetaker.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikpicturetaker.py Wed Oct 14 01:05:03 2009
@@ -1,8 +1,9 @@
from PyObjCTools.TestSupport import *
-from Quartz.ImageKit import *
+from Quartz import *
class TestIKPictureTaker (TestCase):
+ @min_os_level('10.5')
def testMethods(self):
self.failUnlessArgIsSEL(IKPictureTaker.beginPictureTakerWithDelegate_didEndSelector_contextInfo_, 1, 'v@:@' + objc._C_NSInteger + '^v')
self.failUnlessArgIsSEL(IKPictureTaker.beginPictureTakerSheetForWindow_withDelegate_didEndSelector_contextInfo_, 2, 'v@:@' + objc._C_NSInteger + '^v')
@@ -11,6 +12,7 @@
self.failUnlessResultIsBOOL(IKPictureTaker.mirroring)
self.failUnlessArgIsBOOL(IKPictureTaker.setMirroring_, 0)
+ @min_os_level('10.5')
def testConstants(self):
self.failUnlessIsInstance(IKPictureTakerAllowsVideoCaptureKey, unicode)
self.failUnlessIsInstance(IKPictureTakerAllowsFileChoosingKey, unicode)
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikslideshow.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikslideshow.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_ikslideshow.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.ImageKit import *
+from Quartz import *
class TestIKSlideShowHelper (NSObject):
def slideshowItemAtIndex_(self, idx): return None
@@ -10,9 +10,11 @@
class TestIKSlideshow (TestCase):
+ @min_os_level('10.5')
def no_testProtocols(self):
self.failUnlessIsInstance(objc.protocolNamed("IKSlideshowDataSource"), objc.formal_protocol)
+ @min_os_level('10.5')
def testProtocolMethods(self):
self.failUnlessArgHasType(TestIKSlideShowHelper.slideshowItemAtIndex_, 0, objc._C_NSUInteger)
self.failUnlessArgHasType(TestIKSlideShowHelper.nameOfSlideshowItemAtIndex_, 0, objc._C_NSUInteger)
@@ -20,9 +22,11 @@
self.failUnlessResultIsBOOL(TestIKSlideShowHelper.canExportSlideshowItemAtIndex_toApplication_)
self.failUnlessArgHasType(TestIKSlideShowHelper.slideshowDidChangeCurrentIndex_, 0, objc._C_NSUInteger)
+ @min_os_level('10.5')
def testMethods(self):
self.failUnlessResultIsBOOL(IKSlideshow.canExportToApplication_)
+ @min_os_level('10.5')
def testConstants(self):
self.failUnlessIsInstance(IKSlideshowModeImages, unicode)
self.failUnlessIsInstance(IKSlideshowModePDF, unicode)
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_imagekitdeprecated.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_imagekitdeprecated.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_imagekitdeprecated.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.ImageKit import *
+from Quartz import *
class TestImageKitDeprecatedHelper (NSObject):
@@ -11,6 +11,7 @@
class TestImageKitDeprecated (TestCase):
+ @min_os_level('10.5')
def testConstants(self):
self.failUnlessEqual(IKImagePickerAllowsVideoCaptureKey, IKPictureTakerAllowsVideoCaptureKey)
self.failUnlessEqual(IKImagePickerAllowsFileChoosingKey, IKPictureTakerAllowsFileChoosingKey)
@@ -26,10 +27,12 @@
self.failUnlessIsInstance(IKPictureTakerShowAddressBookPicture, unicode)
self.failUnlessIsInstance(IKPictureTakerShowEmptyPicture, unicode)
+ @min_os_level('10.5')
def testMethods(self):
self.failUnlessArgIsSEL(IKImagePicker.beginImagePickerWithDelegate_didEndSelector_contextInfo_, 1, 'v@:@' + objc._C_NSUInteger + '^v')
self.failUnlessArgIsSEL(IKImagePicker.beginImagePickerSheetForWindow_withDelegate_didEndSelector_contextInfo_, 2, 'v@:@' + objc._C_NSUInteger + '^v')
+ @min_os_level('10.5')
def testProtocols(self):
self.failUnlessIsInstance(protocols.IKImageBrowserDataSourceDeprecated, objc.informal_protocol)
Modified: trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_quartzfilter.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_quartzfilter.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/PyObjCTest/test_quartzfilter.py Wed Oct 14 01:05:03 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
-from Quartz.QuartzFilters import *
+from Quartz import *
class TestQuartzFilter (TestCase):
def testMethods(self):
Modified: trunk/pyobjc/pyobjc-framework-Quartz/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Quartz/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Quartz/setup.py Wed Oct 14 01:05:03 2009
@@ -33,71 +33,41 @@
WARNING: Running the unittests will change your display settings during the
testrun, which will probably mess up your window layout.
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup, Extension
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
-
-import os
-
-if int(os.uname()[2].split('.')[0]) > 8:
- CV_CFLAGS=["-DWITH_CORE_VIDEO", "-isysroot", "/"]
-else:
- CV_CFLAGS=[]
-
-if int(os.uname()[2].split('.')[0]) > 8:
- CFLAGS = [ "-isysroot", "/" ]
-else:
- CFLAGS=[ "-DNO_OBJC2_RUNTIME", "-DOS_TIGER" ]
+from pyobjc_setup import setup, Extension
setup(
name='pyobjc-framework-Quartz',
version='2.2b4',
description = "Wrappers for the Quartz frameworks on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
- packages = [ "Quartz", "Quartz.CoreGraphics", "Quartz.ImageIO", "Quartz.QuartzCore", "Quartz.CoreVideo", "Quartz.QuartzComposer", "Quartz.ImageKit", "Quartz.PDFKit", "Quartz.QuartzFilters" ],
- package_dir = { '': 'Lib' },
+ 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',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('Quartz'),
- zip_safe = True,
ext_modules = [
# CoreVideo
Extension('Quartz.CoreVideo._CVPixelBuffer',
[ 'Modules/_CVPixelBuffer.m' ],
- extra_compile_args=CV_CFLAGS + CFLAGS),
+ ),
# CoreGraphics
Extension('Quartz.CoreGraphics._inlines',
[ 'Modules/_CoreGraphics_inlines.m' ],
- extra_compile_args=CFLAGS),
+ ),
Extension('Quartz.CoreGraphics._callbacks',
[ 'Modules/_callbacks.m' ],
- extra_compile_args=CFLAGS),
+ ),
Extension('Quartz.CoreGraphics._doubleindirect',
[ 'Modules/_doubleindirect.m' ],
- extra_compile_args=CFLAGS),
+ ),
Extension('Quartz.CoreGraphics._sortandmap',
[ 'Modules/_sortandmap.m' ],
- extra_compile_args=CFLAGS),
+ ),
Extension('Quartz.CoreGraphics._coregraphics',
[ 'Modules/_coregraphics.m' ],
- extra_compile_args=CFLAGS),
+ ),
],
)
Modified: trunk/pyobjc/pyobjc-framework-ScreenSaver/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-ScreenSaver/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-ScreenSaver/setup.py Wed Oct 14 01:05:03 2009
@@ -7,41 +7,20 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup, Extension
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup, Extension
setup(
name='pyobjc-framework-ScreenSaver',
version='2.2b4',
description = "Wrappers for the framework ScreenSaver on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "ScreenSaver" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
ext_modules = [
Extension('ScreenSaver._inlines',
[ 'Modules/_ScreenSaver_inlines.m' ],
extra_link_args=['-framework', 'ScreenSaver']),
],
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('ScreenSaver'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-ScriptingBridge/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-ScriptingBridge/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-ScriptingBridge/setup.py Wed Oct 14 01:05:03 2009
@@ -12,36 +12,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import *
setup(
+ min_os_level='10.5',
name='pyobjc-framework-ScriptingBridge',
version='2.2b4',
description = "Wrappers for the framework ScriptingBridge on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "ScriptingBridge" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('ScriptingBridge'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-SearchKit/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SearchKit/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-SearchKit/setup.py Wed Oct 14 01:05:03 2009
@@ -7,36 +7,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
+ min_os_level='10.5',
name='pyobjc-framework-SearchKit',
version='2.2b4',
description = "Wrappers for the framework SearchKit on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "SearchKit" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('SearchKit'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-ServerNotification/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-ServerNotification/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-ServerNotification/setup.py Wed Oct 14 01:05:03 2009
@@ -8,39 +8,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
+ min_os_level='10.6',
name='pyobjc-framework-ServerNotification',
version='2.2b4',
description = "Wrappers for the framework ServerNotification on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "ServerNotification" ],
- package_dir = {
- '': 'Lib'
- },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- dependency_links = [],
- package_data = {
- '': ['*.xml']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('ServerNotification'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-ServiceManagement/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-ServiceManagement/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-ServiceManagement/setup.py Wed Oct 14 01:05:03 2009
@@ -8,39 +8,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
+ min_os_level='10.6',
name='pyobjc-framework-ServiceManagement',
version='2.2b4',
description = "Wrappers for the framework ServiceManagement on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "ServiceManagement" ],
- package_dir = {
- '': 'Lib'
- },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- dependency_links = [],
- package_data = {
- '': ['*.xml']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('ServiceManagement'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncchange.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncchange.py (original)
+++ trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncchange.py Wed Oct 14 01:05:03 2009
@@ -14,6 +14,9 @@
self.failUnlessIsInstance(ISyncChangePropertyClear, unicode)
self.failUnlessIsInstance(ISyncChangePropertyNameKey, unicode)
self.failUnlessIsInstance(ISyncChangePropertyValueKey, unicode)
+
+ @min_os_level('10.5')
+ def testConstants10_5(self):
self.failUnlessIsInstance(ISyncChangePropertyValueIsDefaultKey, unicode)
if __name__ == "__main__":
Modified: trunk/pyobjc/pyobjc-framework-SyncServices/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SyncServices/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-SyncServices/setup.py Wed Oct 14 01:05:03 2009
@@ -12,37 +12,16 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
name='pyobjc-framework-SyncServices',
version='2.2b4',
description = "Wrappers for the framework SyncServices on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "SyncServices" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
'pyobjc-framework-CoreData>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('SyncServices'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-SystemConfiguration/PyObjCTest/test_systemconfiguration.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SystemConfiguration/PyObjCTest/test_systemconfiguration.py (original)
+++ trunk/pyobjc/pyobjc-framework-SystemConfiguration/PyObjCTest/test_systemconfiguration.py Wed Oct 14 01:05:03 2009
@@ -26,12 +26,18 @@
self.failUnlessEqual(kSCStatusMaxLink, 3006)
self.failUnlessEqual(kSCStatusReachabilityUnknown, 4001)
+ @min_os_level('10.5')
+ def testConstants10_5(self):
self.failUnlessIsInstance(kCFErrorDomainSystemConfiguration, unicode)
- def testFunctions(self):
+ @min_os_level('10.5')
+ def testFunctions10_5(self):
err = SCCopyLastError()
self.failUnless(isinstance(err, CFErrorRef))
+
+ def testFunctions(self):
+
err = SCError()
self.failUnlessIsInstance(err, (int, long))
Modified: trunk/pyobjc/pyobjc-framework-SystemConfiguration/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SystemConfiguration/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-SystemConfiguration/setup.py Wed Oct 14 01:05:03 2009
@@ -6,48 +6,20 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup, Extension
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
-
-import os
-if os.uname()[2] >= '9.':
- CFLAGS=['-isysroot','/']
-else:
- CFLAGS=[]
+from pyobjc_setup import setup, Extension
setup(
name='pyobjc-framework-SystemConfiguration',
version='2.2b4',
description = "Wrappers for the framework SystemConfiguration on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "SystemConfiguration" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
ext_modules = [
Extension('SystemConfiguration._manual',
[ 'Modules/_manual.m' ],
- extra_compile_args=CFLAGS,
),
],
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('SystemConfiguration'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-WebKit/PyObjCTest/test_carbonutils.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-WebKit/PyObjCTest/test_carbonutils.py (original)
+++ trunk/pyobjc/pyobjc-framework-WebKit/PyObjCTest/test_carbonutils.py Wed Oct 14 01:05:03 2009
@@ -8,7 +8,7 @@
def testFunctions(self):
WebInitForCarbon()
- img = NSImage.imageNamed_('NSAddTemplate')
+ img = NSImage.imageNamed_('NSHelpCursor')
self.failUnlessIsInstance(img, NSImage)
ref = WebConvertNSImageToCGImageRef(img)
Modified: trunk/pyobjc/pyobjc-framework-WebKit/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-WebKit/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-WebKit/setup.py Wed Oct 14 01:05:03 2009
@@ -8,36 +8,15 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
name='pyobjc-framework-WebKit',
version='2.2b4',
description = "Wrappers for the framework WebKit on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "WebKit", "JavaScriptCore" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('WebKit'),
- zip_safe = True,
)
Modified: trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgjob.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgjob.py (original)
+++ trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgjob.py Wed Oct 14 01:05:03 2009
@@ -26,6 +26,9 @@
self.failUnlessIsInstance(XGJobSpecificationDependsOnTasksKey, unicode)
self.failUnlessIsInstance(XGJobSpecificationNotificationEmailKey, unicode)
self.failUnlessIsInstance(XGJobSpecificationApplicationIdentifierKey, unicode)
+
+ @min_os_level('10.5')
+ def testConstants10_5(self):
self.failUnlessIsInstance(XGJobSpecificationSchedulerHintsKey, unicode)
self.failUnlessIsInstance(XGJobSpecificationARTSpecificationsKey, unicode)
self.failUnlessIsInstance(XGJobSpecificationARTConditionsKey, unicode)
Modified: trunk/pyobjc/pyobjc-framework-XgridFoundation/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-XgridFoundation/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-XgridFoundation/setup.py Wed Oct 14 01:05:03 2009
@@ -8,36 +8,15 @@
for general tips and tricks regarding the translation between Python
and (Objective-)C frameworks
'''
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup
-try:
- from PyObjCMetaData.commands import extra_cmdclass, extra_options
-except ImportError:
- extra_cmdclass = {}
- extra_options = lambda name: {}
+from pyobjc_setup import setup
setup(
name='pyobjc-framework-XgridFoundation',
version='2.2b4',
description = "Wrappers for the framework XgridFoundation on Mac OS X",
- long_description = __doc__,
- author='Ronald Oussoren',
- author_email='[email protected]',
- url='http://pyobjc.sourceforge.net',
- platforms = [ "MacOS X" ],
packages = [ "XgridFoundation" ],
- package_dir = { '': 'Lib' },
install_requires = [
'pyobjc-core>=2.2b4',
'pyobjc-framework-Cocoa>=2.2b4',
],
- package_data = {
- '': ['*.bridgesupport']
- },
- test_suite='PyObjCTest',
- cmdclass = extra_cmdclass,
- options = extra_options('XgridFoundation'),
- zip_safe = True,
)
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference