51c51
< build_env = dict([(opt, env[opt]) for opt in env.ExportOptions])
---
> build_env = dict([(opt, env[opt]) for opt in env.ExportVariables])
245c245
< for opt in env.ExportOptions:
---
> for opt in env.ExportVariables:
356,374d355
< scons_dir = str(SCons.Node.FS.default_fs.SConstruct_dir)
<
< hg_info = "Unknown"
< hg_demandimport = False
< try:
< if not exists(scons_dir) or not isdir(scons_dir) or \
< not exists(joinpath(scons_dir, ".hg")):
< raise ValueError(".hg directory not found")
< import subprocess
< output = subprocess.Popen("hg id -n -i -t -b".split(),
< stdout=subprocess.PIPE).communicate()[0]
< hg_info = output.strip()
< except ImportError, e:
< print "Mercurial not found"
< except ValueError, e:
< print e
< except Exception, e:
< print "Other mercurial exception: %s" % e
<
384c365
< defines_info = [ Value(build_env), Value(hg_info) ]
---
> defines_info = [ Value(build_env), Value(env['HG_INFO']) ]
973c954
< new_env = env.Copy(OBJSUFFIX=objsfx, SHOBJSUFFIX=objsfx + 's')
---
> new_env = env.Clone(OBJSUFFIX=objsfx, SHOBJSUFFIX=objsfx + 's')
977c958
< swig_env = new_env.Copy()
---
> swig_env = new_env.Clone()