"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "sconstruct" between
relax-4.1.3.src.tar.bz2 and relax-5.0.0.src.tar.bz2

About: relax allows the study of molecular dynamics through the analysis of experimental NMR data. Organic molecules, proteins, RNA, DNA, sugars, and other biomolecules are all supported.

sconstruct  (relax-4.1.3.src.tar.bz2):sconstruct  (relax-5.0.0.src.tar.bz2)
skipping to change at line 60 skipping to change at line 60
# The operating system. # The operating system.
SYSTEM = platform.uname()[0] SYSTEM = platform.uname()[0]
# The machine type. # The machine type.
MACH = platform.uname()[4] MACH = platform.uname()[4]
# Symbolic link flag. # Symbolic link flag.
SYMLINK_FLAG = 1 SYMLINK_FLAG = 1
# Force a different target archictecture for MS Windows, if set (as the default # Determine the target architecture based on the Python binary (currently Window
Python download is 32-bit). s only).
WIN_TARGET_OVERRIDE = True
TARGET_ARCH = None TARGET_ARCH = None
arch = platform.architecture()[0]
if arch == '32bit':
TARGET_ARCH = 'x86'
elif arch == '64bit':
TARGET_ARCH = 'x86_64'
# GNU/Linux. # GNU/Linux.
if SYSTEM == 'Linux': if SYSTEM == 'Linux':
# System specific string. # System specific string.
SYS = 'GNU-Linux' SYS = 'GNU-Linux'
# Linux installation path. # Linux installation path.
INSTALL_PATH = '/usr/local' INSTALL_PATH = '/usr/local'
# MS Windows. # MS Windows.
elif SYSTEM == 'Windows' or SYSTEM == 'Microsoft': elif SYSTEM == 'Windows' or SYSTEM == 'Microsoft':
# Set the system to 'Windows' no matter what. # Set the system to 'Windows' no matter what.
SYSTEM = 'Windows' SYSTEM = 'Windows'
# Force a default of 32-bit. # 32 bit.
if WIN_TARGET_OVERRIDE: if arch == '32bit':
TARGET_ARCH = 'x86'
SYS = 'Win32' SYS = 'Win32'
# Determine the architecture. # 64 bit.
else: elif arch == '64bit':
# Architecture. SYS = 'Win64'
arch = platform.architecture()[0]
# 32 bit. # Unknown.
if arch == '32bit': else:
SYS = 'Win32' SYS = 'Win'
# 64 bit.
elif arch == '64bit':
SYS = 'Win64'
# Unknown.
else:
SYS = 'Win'
# Windows installation path. # Windows installation path.
INSTALL_PATH = 'C:\\' INSTALL_PATH = 'C:\\'
# No symlinks! # No symlinks!
SYMLINK_FLAG = 0 SYMLINK_FLAG = 0
# Mac OS X. # Mac OS X.
elif SYSTEM == 'Darwin': elif SYSTEM == 'Darwin':
# System specific string. # System specific string.
skipping to change at line 378 skipping to change at line 372
# Print out. # Print out.
print print
print("#########################") print("#########################")
print("# Cleaning up all files #") print("# Cleaning up all files #")
print("#########################\n\n") print("#########################\n\n")
# Extensions of files to remove. # Extensions of files to remove.
temp_extns = ['so', 'sconsign', 'dll', 'pyd'] temp_extns = ['so', 'sconsign', 'dll', 'pyd']
# Print out. # Print out.
print("\nRemoving the files ending in " + str(temp_extns) + ".\n") print("\nRemoving the files ending in %s.\n" % temp_extns)
# Walk through the directories. # Walk through the directories.
for root, dirs, files in walk(getcwd()): for root, dirs, files in walk(getcwd()):
# Loop over the files in the current directory. # Loop over the files in the current directory.
for file in files: for file in files:
# Loop over the extensions. # Loop over the extensions.
for ext in temp_extns: for ext in temp_extns:
if search('\.' + ext + '$', file): if search('\.' + ext + '$', file):
remove(path.join(root, file)) remove(path.join(root, file))
skipping to change at line 413 skipping to change at line 407
# Print out. # Print out.
print print
print("###############################") print("###############################")
print("# Cleaning up temporary files #") print("# Cleaning up temporary files #")
print("###############################\n\n") print("###############################\n\n")
# Extensions of temporary files. # Extensions of temporary files.
temp_extns = ['pyc', 'pyo', 'bak', 'o', 'os', 'obj', 'exp', 'lib'] temp_extns = ['pyc', 'pyo', 'bak', 'o', 'os', 'obj', 'exp', 'lib']
# Print out. # Print out.
print("\nRemoving the files ending in " + str(temp_extns) + ".\n") print("\nRemoving the files ending in %s.\n" % temp_extns)
# Walk through the directories. # Walk through the directories.
for root, dirs, files in walk(getcwd()): for root, dirs, files in walk(getcwd()):
# Loop over the files in the current directory. # Loop over the files in the current directory.
for file in files: for file in files:
# Loop over the extensions. # Loop over the extensions.
for ext in temp_extns: for ext in temp_extns:
if search('\.' + ext + '$', file): if search('\.' + ext + '$', file):
remove(path.join(root, file)) remove(path.join(root, file))
skipping to change at line 513 skipping to change at line 507
def dummy(self, target, source, env): def dummy(self, target, source, env):
"""Dummy function which returns zero.""" """Dummy function which returns zero."""
return 0 return 0
def help(self): def help(self):
"""The help message.""" """The help message."""
# Intro. # Intro.
string = '\nHelp for using Scons to build the various components of rela target_format = " %-25s%-40s\n"
x.\n\n' string = "\nHelp for using Scons to build the various components of rela
x.\n\n"
# Usage message. # Usage message.
string = string + 'usage: scons [target]\n' string += "usage: scons [target]\n"
# No target. # No target.
string = string + '\nNo target:\n' string += "\nNo target:\n"
string = string + ' %-25s\n' % ('compile the C modules') string += " %-25s\n" % ("Compile the C modules.")
# Standard targets. # Standard targets.
string = string + '\nStandard targets:\n' string += "\nStandard targets:\n"
string = string + ' %-25s%-40s\n' % ('install', 'install relax') string += target_format % ("install", "Install relax.")
string = string + ' %-25s%-40s\n' % ('uninstall', 'uninstall relax') string += target_format % ("uninstall", "Uninstall relax.")
string = string + ' %-25s%-40s\n' % ('binary_dist', 'create the binary string += target_format % ("binary_dist", "Create the binary distributio
distribution packages') n packages.")
string = string + ' %-25s%-40s\n' % ('source_dist', 'create the source string += target_format % ("source_dist", "Create the source distributio
distribution packages') n packages.")
string = string + ' %-25s%-40s\n' % ('clean', 'remove the temporary fil string += target_format % ("clean", "Remove the temporary files.")
es') string += target_format % ("clean_all", "Remove the compiled and tempora
string = string + ' %-25s%-40s\n' % ('clean_all', 'remove the compiled ry files.")
and temporary files') string += target_format % ("user_manual_pdf", "Create the user manual (P
string = string + ' %-25s%-40s\n' % ('user_manual_pdf', 'create the use DF version).")
r manual (PDF version)') string += target_format % ("user_manual_pdf_nofetch", "Create the user m
string = string + ' %-25s%-40s\n' % ('user_manual_pdf_nofetch', 'create anual (PDF version, without fetching the docstrings).")
the user manual (PDF version, without fetching the docstrings)') string += target_format % ("user_manual_html", "Create the user manual (
string = string + ' %-25s%-40s\n' % ('user_manual_html', 'create the us HTML version).")
er manual (HTML version)') string += target_format % ("user_manual_html_nofetch", "Create the user
string = string + ' %-25s%-40s\n' % ('user_manual_html_nofetch', 'creat manual (HTML version, without fetching the docstrings).")
e the user manual (HTML version, without fetching the docstrings)') string += target_format % ("api_manual_html", "Create the API documentat
string = string + ' %-25s%-40s\n' % ('api_manual_html', 'create the API ion manual (HTML version).")
documentation manual (HTML version)')
# Specific targets. # Specific targets.
string = string + '\nSpecific targets:\n' string += "\nSpecific targets:\n"
string = string + ' %-25s%-40s\n' % ('package_bin', 'package the binary string += target_format % ("package_bin", "Package the binary distributi
distribution') on.")
string = string + ' %-25s%-40s\n' % ('package_src', 'package the source string += target_format % ("package_src", "Package the source distributi
distribution') on.")
string = string + ' %-25s%-40s\n' % ('gpg_bin', 'GPG sign the binary di string += target_format % ("gpg_bin", "GPG sign the binary distribution
stribution file') file.")
string = string + ' %-25s%-40s\n' % ('gpg_src', 'GPG sign the source di string += target_format % ("gpg_src", "GPG sign the source distribution
stribution file') file.")
string = string + ' %-25s%-40s\n' % ('version_check', 'check the relax string += target_format % ("version_check", "Check the relax version num
version number') ber.")
string = string + ' %-25s%-40s\n' % ('manual_version_file', 'create the string += target_format % ("manual_version_file", "Create the relax vers
relax version number LaTeX file') ion number LaTeX file.")
string = string + ' %-25s%-40s\n' % ('manual_copyright_file', 'create t string += target_format % ("manual_copyright_file", "Create the LaTeX fi
he LaTeX file containing the copyright notice') le containing the copyright notice.")
string = string + ' %-25s%-40s\n' % ('replicate_title_check', 'check fo string += target_format % ("replicate_title_check", "Check for replicate
r replicated titles in the LaTeX sources') d titles in the LaTeX sources.")
string = string + ' %-25s%-40s\n' % ('fetch_docstrings', 'fetch and LaT string += target_format % ("fetch_docstrings", "Fetch and LaTeX format t
eX format the docstrings') he docstrings.")
string = string + ' %-25s%-40s\n' % ('compile_user_manual_pdf', 'compil string += target_format % ("compile_user_manual_pdf", "Compile the PDF v
e the PDF version of the user manual from the LaTeX sources') ersion of the user manual from the LaTeX sources.")
string = string + ' %-25s%-40s\n' % ('compile_user_manual_html', 'compi string += target_format % ("compile_user_manual_html", "Compile the HTML
le the HTML version of the user manual from the LaTeX sources') version of the user manual from the LaTeX sources.")
string = string + ' %-25s%-40s\n' % ('compile_api_manual_html', 'compil string += target_format % ("compile_api_manual_html", "Compile the HTML
e the HTML version of the API documentation manual using Epydoc') version of the API documentation manual using Epydoc.")
string = string + ' %-25s%-40s\n' % ('manual_clean', 'remove the tempor string += target_format % ("manual_clean", "Remove the temporary manual
ary manual files') files.")
string = string + ' %-25s%-40s\n' % ('manual_clean_nodeps', 'remove the string += target_format % ("manual_clean_nodeps", "Remove the temporary
temporary manual files (with no manual environments dependent on it)') manual files (with no manual environments dependent on it).")
# Environmental variables.
string += "\nOptional environmental variables:\n"
string += target_format % ("CC", "The compiler to use.")
string += target_format % ("CFLAGS", "The compiler flags.")
string += target_format % ("LDFLAGS", "The linker flags.")
string += target_format % ("PYTHON_INCLUDE_DIR", "Manually specify where
the version-specific 'Python.h' file is located.")
# Set the help message. # Set the help message.
Help(string) Help(string)
def relax_fit(self): def relax_fit(self):
"""Function for setting up scons for building the relaxation curve fitti ng C modules.""" """Function for setting up scons for building the relaxation curve fitti ng C modules."""
# The directory. # The directory.
dir = 'target_functions' dir = 'target_functions'
skipping to change at line 654 skipping to change at line 656
env.Append(CFLAGS = environ['CFLAGS']) env.Append(CFLAGS = environ['CFLAGS'])
if 'CC' in environ: if 'CC' in environ:
env.Replace(CC = environ['CC']) env.Replace(CC = environ['CC'])
# Build the relaxation curve fitting module. # Build the relaxation curve fitting module.
self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 'relax _fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix) self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 'relax _fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)
# Print out string returning function. # Print out string returning function.
def print_string(target, source, env): def print_string(target, source, env):
string = "\n\n\n\n" string = "\n\n\n\n"
string = string + "###########################\n" string += "###########################\n"
string = string + "# Compiling the C modules #\n" string += "# Compiling the C modules #\n"
string = string + "###########################\n\n\n" string += "###########################\n\n\n"
string = string + "Building the relaxation curve fitting module " + string += "Building the relaxation curve fitting module '%s'.\n" % s
str(self.relax_fit_object[0]) + "\n" elf.relax_fit_object[0]
if SYSTEM == 'Windows':
string += "MS Windows target arch: %s\n" % TARGET_ARCH
return string return string
# Add the printout as an action to take before constructing the first ob ject. # Add the printout as an action to take before constructing the first ob ject.
env.AddPreAction(nodes[0], Action(self.dummy, print_string)) env.AddPreAction(nodes[0], Action(self.dummy, print_string))
def test_version(self, target, source, env): def test_version(self, target, source, env):
"""Builder action for testing that the program version number has been s et.""" """Builder action for testing that the program version number has been s et."""
# Print out. # Print out.
print print
print("#######################################") print("#######################################")
print("# Checking the program version number #") print("# Checking the program version number #")
print("#######################################\n\n") print("#######################################\n\n")
print("Version number: " + version + "\n") print("Version number: %s\n" % version)
# Test. # Test.
if version == "repository commit": if version == "repository commit":
sys.stderr.write("The program version number has not been set.\n\n") sys.stderr.write("The program version number has not been set.\n\n")
sys.exit() sys.exit()
# Final printout. # Final printout.
print("\n\n\n") print("\n\n\n")
# Execute the main class. # Execute the main class.
 End of changes. 14 change blocks. 
84 lines changed or deleted 88 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)