Ticket #37630: relax.patch

sconstruct

@@ -100 +100 @@
     SYS = SYSTEM
 
     # Mac OS X installation path.
-    INSTALL_PATH = sys.prefix + sep + 'local'
+    INSTALL_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'lib'
 
 
 # All other operating systems.
@@ -120 +120 @@
 RELAX_PATH = INSTALL_PATH + sep + 'relax'
 
 # Installation path for binaries.
-BIN_PATH = INSTALL_PATH + sep + 'bin'
+BIN_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'bin'
 
 # Symbolic link installation path.
 SYMLINK = BIN_PATH + sep + 'relax'
 
 
-
 # The distribution files.
 #########################
 
@@ -533 +532 @@
                  'relax_fit.c']
 
         # Construct the python include path (for Python.h).
-        py_include_minpath = sys.prefix + path.sep + 'include'
+        py_include_minpath = '@PYTHON_INCL@' + path.sep + '..'
         py_include_fullpath = py_include_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
 
         # Construct the python bin path.
-        py_bin_minpath = sys.prefix + path.sep + 'bin'
+        py_bin_minpath = '@PREFIX@'+ path.sep + 'bin'
         py_bin_fullpath = py_bin_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
 
         # Get the numpy include path (for numpy/arrayobject.h).

relax

@@ -1 @@
-#! /usr/bin/env python
+#!@PREFIX@/bin/python2.7
 
 # Import the relax module.
 import relax

scons/install.py

@@ -113 +113 @@
     ###############
 
     # Run relax to create the *.pyc files.
-    print("\nCreating the byte-compiled *.pyc files.")
-    python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
-    cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
-    print(cmd)
-    system(cmd)
+    #print("\nCreating the byte-compiled *.pyc files.")
+    #python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
+    #cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
+    #print(cmd)
+    #system(cmd)
 
     # Final printout.
     print("\n\n\n")

dep_check.py

@@ -142 +142 @@
 try:
     import scipy
     scipy_module = True
-except ImportError:
+except:
     scipy_module = False
 
 # Numeric python package check.
@@ -157 +157 @@
     from Scientific.Visualization import VMD    # This requires Numeric to be installed (at least in Scientific 2.7.8).
     del VMD
     vmd_module = True
-except ImportError:
+except:
     vmd_module = False
 
 # mpi4py.
@@ -217 +217 @@
 # ctypes module.
 try:
     import ctypes
-    from ctypes import Structure
     ctypes_module = True
 except ImportError:
     message = sys.exc_info()[1]
     ctypes_module = False
     ctypes_module_message = message.args[0]
+try:
+    from ctypes import Structure
+    ctypes_structure_module = True
+except ImportError:
+    message = sys.exc_info()[1]
+    ctypes_structure_module = False
+    ctypes_structure_module_message = message.args[0]
+
 
 
 

info.py

@@ -28 +28 @@
 # Python module imports.
 if dep_check.ctypes_module:
     import ctypes
-    from ctypes import Structure
     if hasattr(ctypes, 'windll'):
         import ctypes.wintypes
 else:
     ctypes = None
+if dep_check.ctypes_structure_module:
+    from ctypes import Structure
+else:
     Structure = object
 import numpy
 from os import environ, waitpid