[Pyscard-devel] SF.net SVN: pyscard:[578] trunk/pyscard/src

[<jda...@us...>]

Revision: 578
          http://pyscard.svn.sourceforge.net/pyscard/?rev=578&view=rev
Author:   jdaussel
Date:     2011-10-22 15:00:27 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
Separate handling of snow leopard and lion

Modified Paths:
--------------
    trunk/pyscard/src/setup.py
    trunk/pyscard/src/smartcard/ChangeLog
    trunk/pyscard/src/smartcard/scard/scard.i

Modified: trunk/pyscard/src/setup.py
===================================================================
--- trunk/pyscard/src/setup.py	2011-10-22 13:58:56 UTC (rev 577)
+++ trunk/pyscard/src/setup.py	2011-10-22 15:00:27 UTC (rev 578)
@@ -74,15 +74,30 @@
         platform_extra_link_args = ['-arch', 'i386', '-arch', 'ppc', '-ggdb']
 
 #
-# Mac OS X Snow Leopard, python 2.6
+# Mac OS X Lion, python 2.7
 # PowerPC is no more supported, x86_64 is new
 #
-# Mac OS X Lion, python 2.7
 # x86_64 and i386
 #
-elif 'macosx-10.6' in get_platform() or 'macosx-10.7' in get_platform():
+elif 'macosx-10.7' in get_platform():
     platform__cc_defines = [('PCSCLITE', '1'),
                             ('__APPLE__', '1'),
+                            ('__LION__', '1')]
+    platform_swig_opts = ['-DPCSCLITE', '-D__APPLE__', '-D__LION__']
+    platform_sources = []
+    platform_libraries = []
+    platform_include_dirs = []
+    platform_extra_compile_args = ['-v', '-arch', 'i386',
+                                   '-arch', 'x86_64', '-ggdb']
+    platform_extra_link_args = ['-arch', 'i386', '-arch', 'x86_64', '-ggdb']
+
+#
+# Mac OS X Snow Leopard, python 2.6
+# PowerPC is no more supported, x86_64 is new
+#
+elif 'macosx-10.6' in get_platform():
+    platform__cc_defines = [('PCSCLITE', '1'),
+                            ('__APPLE__', '1'),
                             ('__LEOPARD__', '1')]
     platform_swig_opts = ['-DPCSCLITE', '-D__APPLE__', '-D__LEOPARD__']
     platform_sources = []

Modified: trunk/pyscard/src/smartcard/ChangeLog
===================================================================
--- trunk/pyscard/src/smartcard/ChangeLog	2011-10-22 13:58:56 UTC (rev 577)
+++ trunk/pyscard/src/smartcard/ChangeLog	2011-10-22 15:00:27 UTC (rev 578)
@@ -1,7 +1,9 @@
 1.6.14 (October 2011)
 ===================
         * added support for windows 64bit amd64 (Jean-Daniel Aussel)
+        * support python "new" classes (derive classes from object) (Ludovic Rousseau from chrysn suggestion)
 
+
 1.6.12 (August 2010)
 ===================
         * comply with PEP 8 (Ludovic Rousseau)

Modified: trunk/pyscard/src/smartcard/scard/scard.i
===================================================================
--- trunk/pyscard/src/smartcard/scard/scard.i	2011-10-22 13:58:56 UTC (rev 577)
+++ trunk/pyscard/src/smartcard/scard/scard.i	2011-10-22 15:00:27 UTC (rev 578)
@@ -2086,6 +2086,9 @@
         #ifdef __LEOPARD__
             %constant char* resourceManagerSubType = "pcsclite-leopard" ;
         #endif //__LEOPARD__
+        #ifdef __LION__
+            %constant char* resourceManagerSubType = "pcsclite-lion" ;
+        #endif //__LION_
     #else // !__APPLE__
         %constant char* resourceManagerSubType = "pcsclite-linux" ;
     #endif // __APPLE__

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.