r15671 - /tags/1.3.14/scons/distrib.py -- April 03, 2012 - 21:14

Author: bugman
Date: Tue Apr  3 21:14:47 2012
New Revision: 15671

URL: http://svn.gna.org/viewcvs/relax?rev=15671&view=rev
Log:
Merged a fix from the main line needed to rebuild the DMG distribution file.

The command used was:
svn merge -r15669:15670 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

.....
r15670 | bugman | 2012-04-03 21:00:02 +0200 (Tue, 03 Apr 2012) | 5 lines
Changed paths:
   M /1.3/scons/distrib.py

   Fix for the scons binary_dist target on Mac OS X systems with multiple 
Python versions.

   Now the py2app program is called with the same python version as used by 
scons.
.....


Modified:
    tags/1.3.14/scons/distrib.py

Modified: tags/1.3.14/scons/distrib.py
URL: 
http://svn.gna.org/viewcvs/relax/tags/1.3.14/scons/distrib.py?rev=15671&r1=15670&r2=15671&view=diff
==============================================================================
--- tags/1.3.14/scons/distrib.py (original)
+++ tags/1.3.14/scons/distrib.py Tue Apr  3 21:14:47 2012
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2006-2011 Edward d'Auvergne                                  
 #
+# Copyright (C) 2006-2012 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -104,7 +104,7 @@
         if dist_type == 'dmg':
             # Create the Mac OS X universal application.
             print("\n# Creating the Mac OS X universal application.\n\n")
-            cmd = 'python setup.py py2app'
+            cmd = '%s setup.py py2app' % sys.executable
             print("%s\n" % cmd)
             pipe = Popen(cmd, shell=True, stdin=PIPE, close_fds=False)
             waitpid(pipe.pid, 0)