"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "monkeypatch_distutils.py" between
pymol-v2.1.0.tar.bz2 and pymol-open-source-2.2.0.tar.gz

About: PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.

monkeypatch_distutils.py  (pymol-v2.1.0.tar.bz2)	:	monkeypatch_distutils.py  (pymol-open-source-2.2.0)
skipping to change at line 76		skipping to change at line 76
cxx = os.environ.get('CXX') or cxx		cxx = os.environ.get('CXX') or cxx
cxxflags = os.environ.get('CXXFLAGS', '') + ' ' + os.environ.get('CPPFLAGS', '')		cxxflags = os.environ.get('CXXFLAGS', '') + ' ' + os.environ.get('CPPFLAGS', '')
ldcxxshared = os.environ.get('LDCXXSHARED', ldcxxshared or '') + \		ldcxxshared = os.environ.get('LDCXXSHARED', ldcxxshared or '') + \
' ' + os.environ.get('LDFLAGS', '') + \		' ' + os.environ.get('LDFLAGS', '') + \
' ' + os.environ.get('CXXFLAGS', '') + \		' ' + os.environ.get('CXXFLAGS', '') + \
' ' + os.environ.get('CPPFLAGS', '')		' ' + os.environ.get('CPPFLAGS', '')
cxx_cmd = cxx + ' ' + cxxflags		cxx_cmd = cxx + ' ' + cxxflags
# C++11 by default (c++0x works for now and supports more compiler versions)		# C++11 by default
if '-std=' not in cxx_cmd:		if '-std=' not in cxx_cmd:
cxx_cmd += ' -std=c++0x'		cxx_cmd += ' -std=c++11'
compiler.set_executables(		compiler.set_executables(
compiler_cxx=cxx_cmd,		compiler_cxx=cxx_cmd,
compiler_so_cxx=cxx_cmd + ' ' + ccshared,		compiler_so_cxx=cxx_cmd + ' ' + ccshared,
linker_so_cxx=ldcxxshared,		linker_so_cxx=ldcxxshared,
linker_exe_cxx=cxx)		linker_exe_cxx=cxx)
@monkeypatch(distutils.unixccompiler.UnixCCompiler, 'compile')		@monkeypatch(distutils.unixccompiler.UnixCCompiler, 'compile')
def compile(self, sources, output_dir=None, macros=None,		def compile(self, sources, output_dir=None, macros=None,
include_dirs=None, debug=0, extra_preargs=None, extra_postargs=None,		include_dirs=None, debug=0, extra_preargs=None, extra_postargs=None,
End of changes. 2 change blocks.
2 lines changed or deleted		2 lines changed or added

---