r22879 - /trunk/setup.py -- April 29, 2014 - 16:06

Author: bugman
Date: Tue Apr 29 16:06:15 2014
New Revision: 22879

URL: http://svn.gna.org/viewcvs/relax?rev=22879&view=rev
Log:
Fix for bug #21970 (http://gna.org/bugs/?21970).

The Mac OS X dmg file required one of the test_suite/shared_data directories 
included in the
'include' list to properly bundle all relax modules inside the Mac App 
framework.  This was
achieved by creating a whitelist structure and adding the directory to that.


Modified:
    trunk/setup.py

Modified: trunk/setup.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/setup.py?rev=22879&r1=22878&r2=22879&view=diff
==============================================================================
--- trunk/setup.py      (original)
+++ trunk/setup.py      Tue Apr 29 16:06:15 2014
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2011-2013 Edward d'Auvergne                                  
 #
+# Copyright (C) 2011-2014 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -174,6 +174,11 @@
         ]
         blacklist_files = [
         ]
+        
+        # Whitelisted directories.
+        whitelist_dir = [
+            'test_suite'+sep+'shared_data'+sep+'frame_order'+sep+'cam'
+        ]
 
         # All files and directories.
         includes = []
@@ -190,7 +195,7 @@
             # Skip blacklisted directories.
             skip = False
             for dir_name in blacklist_dir:
-                if search(dir_name, rel_path):
+                if search(dir_name, rel_path) and rel_path not in 
whitelist_dir:
                     skip = True
             if skip:
                 continue