r6321 - in /1.2: ./ sconstruct -- June 08, 2008 - 00:30

Author: bugman
Date: Sun Jun  8 00:18:26 2008
New Revision: 6321

URL: http://svn.gna.org/viewcvs/relax?rev=6321&view=rev
Log:
Merged revisions 6320 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r6320 | bugman | 2008-06-07 19:33:23 +0200 (Sat, 07 Jun 2008) | 7 lines
  
  Bug fix for compilation on Windows with Python 2.5.
  
  The shared library extension should end with '.pyd' in Windows.  For Python 
versions 2.4 and below,
  '.dll' extensions were happily loaded.  But with version 2.5, this 
extension is no longer
  recognised!
........

Modified:
    1.2/   (props changed)
    1.2/sconstruct

Propchange: 1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jun  8 00:18:26 2008
@@ -1,1 +1,1 @@
-/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318,3345,3372,4145,4473,4476,4939,5117,5255,5396-5398,5462-5465,5611-5612,5622,5663,5971,6020-6023,6025,6033,6041,6044,6104,6106,6306,6308
+/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318,3345,3372,4145,4473,4476,4939,5117,5255,5396-5398,5462-5465,5611-5612,5622,5663,5971,6020-6023,6025,6033,6041,6044,6104,6106,6306,6308,6320

Modified: 1.2/sconstruct
URL: 
http://svn.gna.org/viewcvs/relax/1.2/sconstruct?rev=6321&r1=6320&r2=6321&view=diff
==============================================================================
--- 1.2/sconstruct (original)
+++ 1.2/sconstruct Sun Jun  8 00:18:26 2008
@@ -357,7 +357,7 @@
         print "###############\n\n"
 
         # Extensions of files to remove.
-        temp_extns = ['so', 'sconsign', 'dll']
+        temp_extns = ['so', 'sconsign', 'dll', 'pyd']
 
         # Print out.
         print "\nRemoving the files ending in " + `temp_extns` + ".\n"
@@ -491,7 +491,12 @@
         if env['PLATFORM'] == 'darwin':
             env.Append(LINKFLAGS = ['-bundle', '-bundle_loader', sys.prefix 
+ path.sep + 'bin' + path.sep + 'python', '-dynamic'])
             env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS')
-            env['SHLIBSUFFIX'] = '.so'
+
+        # Shared library prefix and suffix.
+        prefix = ''
+        suffix = '.so'
+        if SYSTEM == 'Windows':
+            suffix = '.pyd'
 
         # Loop over the relaxation curve fitting files.
         nodes = []
@@ -499,7 +504,7 @@
             nodes.append(env.SharedObject(dir + path.sep + file, 
CCFLAGS=cflags))
 
         # Build the relaxation curve fitting module.
-        self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 
'relax_fit', source=nodes, SHLIBPREFIX='')
+        self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 
'relax_fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)
 
         # Print out string returning function.
         def print_string(target, source, env):