Copy is deprecated by Clone in scons 0.96.93

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4813 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-11-11 13:04:35 +00:00
parent 79a3b31431
commit 4bdb1ebd7d
7 changed files with 40 additions and 40 deletions

View file

@ -15,27 +15,27 @@ defenv['SUBSYS_CON'] = ''
### stub environment
stub_env = defenv.Copy()
stub_env = defenv.Clone()
### makensis environment
makensis_env = defenv.Copy()
makensis_env = defenv.Clone()
### plugin environment
plugin_env = defenv.Copy(no_import_lib = 1)
plugin_env = defenv.Clone(no_import_lib = 1)
### util environment
util_env = defenv.Copy()
util_env = defenv.Clone()
### cross-platform util environment
cp_util_env = util_env.Copy()
cp_util_env = util_env.Clone()
### test environment
test_env = defenv.Copy()
test_env = defenv.Clone()
# return

View file

@ -57,7 +57,7 @@ if defenv['DEBUG']:
### stub environment
stub_env = defenv.Copy()
stub_env = defenv.Clone()
cross_env(stub_env)
if not defenv['DEBUG']:
@ -75,7 +75,7 @@ stub_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
### makensis environment
makensis_env = defenv.Copy()
makensis_env = defenv.Clone()
if not defenv['DEBUG']:
makensis_env.Append(CCFLAGS = '-O2') # optimize
@ -89,7 +89,7 @@ conf.Finish()
### plugin environment
plugin_env = defenv.Copy()
plugin_env = defenv.Clone()
cross_env(plugin_env)
if not defenv['DEBUG']:
@ -104,7 +104,7 @@ plugin_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
### cross-platform util environment
cp_util_env = defenv.Copy()
cp_util_env = defenv.Clone()
if not defenv['DEBUG']:
cp_util_env.Append(CCFLAGS = '-O2') # optimize
@ -118,7 +118,7 @@ conf.Finish()
### util environment
util_env = cp_util_env.Copy()
util_env = cp_util_env.Clone()
cross_env(util_env)
util_env.Append(LINKFLAGS = '-mwindows') # build windows executables
@ -126,7 +126,7 @@ util_env.Append(LINKFLAGS = '$ALIGN_FLAG') # 512 bytes align
### test environment
test_env = defenv.Copy()
test_env = defenv.Clone()
### weird GCC requirements
@ -196,7 +196,7 @@ def add_file(file):
add_file_to_emitter(util_env, 'PROGEMITTER', file)
add_file_to_emitter(plugin_env, 'SHLIBEMITTER', file)
cenv = defenv.Copy()
cenv = defenv.Clone()
cross_env(cenv)
conf = cenv.Configure(custom_tests = { 'CheckRequirement' : check_requirement })

View file

@ -39,7 +39,7 @@ if defenv['DEBUG']:
if not defenv['TEMP_MSVC2005']:
confenv = defenv.Copy()
confenv = defenv.Clone()
conf = confenv.Configure()
libcptest = """
@ -76,7 +76,7 @@ if not defenv['TEMP_MSVC2005']:
### stub environment
stub_env = defenv.Copy()
stub_env = defenv.Clone()
if not defenv['DEBUG']:
stub_env.Append(CCFLAGS = '/O1') # optimize for size
@ -89,7 +89,7 @@ stub_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
### makensis environment
makensis_env = defenv.Copy()
makensis_env = defenv.Clone()
if not defenv['DEBUG']:
makensis_env.Append(CCFLAGS = '/O2') # optimize for speed
@ -101,7 +101,7 @@ makensis_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
### plugin environment
plugin_env = defenv.Copy(no_import_lib = 1)
plugin_env = defenv.Clone(no_import_lib = 1)
if not defenv['DEBUG']:
plugin_env.Append(CCFLAGS = '/O1') # optimize for size
@ -112,7 +112,7 @@ plugin_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
### util environment
util_env = defenv.Copy()
util_env = defenv.Clone()
if not defenv['DEBUG']:
util_env.Append(CCFLAGS = '/O1') # optimize for speed
@ -123,11 +123,11 @@ util_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
### cross-platform util environment
cp_util_env = util_env.Copy()
cp_util_env = util_env.Clone()
### test environment
test_env = defenv.Copy()
test_env = defenv.Clone()
### weird compiler requirements