r20573 - /trunk/devel_scripts/framework_bin_test -- August 09, 2013 - 11:33

Author: bugman
Date: Fri Aug  9 11:33:39 2013
New Revision: 20573

URL: http://svn.gna.org/viewcvs/relax?rev=20573&view=rev
Log:
Better support for 4-way binaries in the Mac OS X Framework detection script.


Modified:
    trunk/devel_scripts/framework_bin_test

Modified: trunk/devel_scripts/framework_bin_test
URL: 
http://svn.gna.org/viewcvs/relax/trunk/devel_scripts/framework_bin_test?rev=20573&r1=20572&r2=20573&view=diff
==============================================================================
--- trunk/devel_scripts/framework_bin_test (original)
+++ trunk/devel_scripts/framework_bin_test Fri Aug  9 11:33:39 2013
@@ -83,24 +83,24 @@
 
             # Arch.
             arch = [None, None, None, None]
-            for i in range(3):
+            for i in range(4):
                 row = data[i+1].split('\t')
                 arch[i] = row[1][:-1]
             arch.sort()
 
             # The full file type printout.
-            if arch == ['Mach-O 64-bit executable x86_64', 'Mach-O 
executable i386', 'Mach-O executable ppc']:
-                part_type = '%s [i386, ppc, x86_64]' % file_type
-                full_type = '%s exec [i386, ppc, x86_64]' % file_type
-            elif arch == ['Mach-O 64-bit bundle x86_64', 'Mach-O bundle 
i386', 'Mach-O bundle ppc']:
-                part_type = '%s [i386, ppc, x86_64]' % file_type
-                full_type = '%s bundle [i386, ppc, x86_64]' % file_type
-            elif arch == ['Mach-O 64-bit dynamically linked shared library 
x86_64', 'Mach-O dynamically linked shared library i386', 'Mach-O dynamically 
linked shared library ppc']:
-                part_type = '%s [i386, ppc, x86_64]' % file_type
-                full_type = '%s lib [i386, ppc, x86_64]' % file_type
-            elif arch == ['Mach-O 64-bit object x86_64', 'Mach-O object 
i386', 'Mach-O object ppc']:
-                part_type = '%s [i386, ppc, x86_64]' % file_type
-                full_type = '%s obj [i386, ppc, x86_64]' % file_type
+            if arch == ['Mach-O 64-bit executable ppc64', 'Mach-O 64-bit 
executable x86_64', 'Mach-O executable i386', 'Mach-O executable ppc']:
+                part_type = '%s [i386, ppc, x86_64, ppc64]' % file_type
+                full_type = '%s exec [i386, ppc, x86_64, ppc64]' % file_type
+            elif arch == ['Mach-O 64-bit bundle ppc64', 'Mach-O 64-bit 
bundle x86_64', 'Mach-O bundle i386', 'Mach-O bundle ppc']:
+                part_type = '%s [i386, ppc, x86_64, ppc64]' % file_type
+                full_type = '%s bundle [i386, ppc, x86_64, ppc64]' % 
file_type
+            elif arch == ['Mach-O 64-bit dynamically linked shared library 
ppc64', 'Mach-O 64-bit dynamically linked shared library x86_64', 'Mach-O 
dynamically linked shared library i386', 'Mach-O dynamically linked shared 
library ppc']:
+                part_type = '%s [i386, ppc, x86_64, ppc64]' % file_type
+                full_type = '%s lib [i386, ppc, x86_64, ppc64]' % file_type
+            elif arch == ['Mach-O 64-bit object ppc64', 'Mach-O 64-bit 
object x86_64', 'Mach-O object i386', 'Mach-O object ppc']:
+                part_type = '%s [i386, ppc, x86_64, ppc64]' % file_type
+                full_type = '%s obj [i386, ppc, x86_64, ppc64]' % file_type
             else:
                 full_type = '%s %s' % (file_type, arch)
                 part_type = full_type