From 4bdb1ebd7d9f963bbf0f72c22e7cb1377a58ea0f Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 11 Nov 2006 13:04:35 +0000 Subject: [PATCH] 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 --- Docs/src/build.but | 4 ++-- INSTALL | 4 ++-- SCons/Config/default | 12 ++++++------ SCons/Config/gnu | 14 +++++++------- SCons/Config/ms | 14 +++++++------- SConstruct | 30 +++++++++++++++--------------- Source/SConscript | 2 +- 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Docs/src/build.but b/Docs/src/build.but index ae3c0dd2..85c98db4 100644 --- a/Docs/src/build.but +++ b/Docs/src/build.but @@ -6,7 +6,7 @@ NSIS version 2.07 introduced a new build system, based on \W{http://www.scons.or Source code is available in \W{http://nsis.cvs.sourceforge.net/nsis}{CVS} and as a separate package with every \W{http://sourceforge.net/project/showfiles.php?group_id=22049}{NSIS distribution}. -To build NSIS \W{http://www.python.org/}{Python} and \W{http://www.scons.org/}{SCons} must be installed. Currently, the supported version of SCons is version 0.96.92. Any version of Python above 1.6 is supported. +To build NSIS \W{http://www.python.org/}{Python} and \W{http://www.scons.org/}{SCons} must be installed. Currently, the supported version of SCons is version 0.96.93. Any version of Python above 1.6 is supported. To build, open a console, change the working directory to the root directory of NSIS and type \c{scons}. That's it. For example: @@ -53,7 +53,7 @@ To get a complete list of options SCons has to offer, type: If Microsoft Visual C++ is installed, SCons will automatically detect and use it. -SCons 0.96.92 does not yet support Microsoft Visual C++ 2005. Therefore a temporary workaround has been added to support this compiler. Add TEMP_MSVC2005=yes to the build command line when using MSVC 2005: +SCons 0.96.93 does not yet support Microsoft Visual C++ 2005. Therefore a temporary workaround has been added to support this compiler. Add TEMP_MSVC2005=yes to the build command line when using MSVC 2005: \c scons TEMP_MSVC2005=yes diff --git a/INSTALL b/INSTALL index 121ac517..bba93fa7 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,7 @@ This is a trimmed version of Appendix "Building NSIS" of the documentation. - Requirements * Python version 1.6 and above (http://www.python.org/) - * SCons version 0.96.92 and above (http://www.scons.org/) + * SCons version 0.96.93 and above (http://www.scons.org/) * C compiler - Optional Tools @@ -32,7 +32,7 @@ This is a trimmed version of Appendix "Building NSIS" of the documentation. - Special cases - * SCons 0.96.92 does not yet support Microsoft Visual C++ 2005. + * SCons 0.96.93 does not yet support Microsoft Visual C++ 2005. Therefore a temporary workaround has been added to support this compiler. Add TEMP_MSVC2005=yes to the build command line when using MSVC 2005: diff --git a/SCons/Config/default b/SCons/Config/default index 6fbcc4b2..da543e7e 100644 --- a/SCons/Config/default +++ b/SCons/Config/default @@ -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 diff --git a/SCons/Config/gnu b/SCons/Config/gnu index 3fbb63f8..fb52f5c8 100644 --- a/SCons/Config/gnu +++ b/SCons/Config/gnu @@ -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 }) diff --git a/SCons/Config/ms b/SCons/Config/ms index 73303368..61fe9d64 100644 --- a/SCons/Config/ms +++ b/SCons/Config/ms @@ -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 diff --git a/SConstruct b/SConstruct index f0a0472c..f2e9cd6b 100644 --- a/SConstruct +++ b/SConstruct @@ -9,9 +9,9 @@ EnsurePythonVersion(1,6) try: - EnsureSConsVersion(0,96,92) + EnsureSConsVersion(0,96,93) except TypeError: # EnsureSConsVersion in older versions took only two parameters - print 'SCons 0.96.92 or greater is required, but you have an older version' + print 'SCons 0.96.93 or greater is required, but you have an older version' Exit(2) stubs = [ @@ -366,7 +366,7 @@ defenv.DistributeConf('nsisconf.nsh') ###################################################################### def BuildStub(compression, solid): - env = stub_env.Copy() + env = stub_env.Clone() suffix = '' if solid: @@ -448,7 +448,7 @@ def BuildPlugin(target, source, libs, examples = None, docs = None, entry = 'DllMain', res = None, res_target = None, resources = None, defines = None, flags = None, nodeflib = True, cppused = False): - env = plugin_env.Copy() + env = plugin_env.Clone() if cppused and env['CPP_REQUIRES_STDLIB']: nodeflib = False @@ -479,7 +479,7 @@ for plugin in plugins: path = 'Contrib/' + plugin build_dir = '$BUILD_PREFIX/' + plugin - exports = {'BuildPlugin' : BuildPlugin, 'env' : plugin_env.Copy()} + exports = {'BuildPlugin' : BuildPlugin, 'env' : plugin_env.Clone()} defenv.SConscript(dirs = path, build_dir = build_dir, duplicate = False, exports = exports) @@ -493,9 +493,9 @@ def BuildUtil(target, source, libs, entry = None, res = None, examples = None, docs = None, cross_platform = False, root_util = False): if not cross_platform: - env = util_env.Copy() + env = util_env.Clone() else: - env = cp_util_env.Copy() + env = cp_util_env.Clone() AddEnvStandardFlags(env, defines, flags, entry, nodeflib) @@ -534,7 +534,7 @@ for util in utils: path = 'Contrib/' + util build_dir = '$BUILD_PREFIX/' + util - exports = {'BuildUtil' : BuildUtil, 'env' : util_env.Copy()} + exports = {'BuildUtil' : BuildUtil, 'env' : util_env.Clone()} defenv.SConscript(dirs = path, build_dir = build_dir, duplicate = False, exports = exports) @@ -546,7 +546,7 @@ halibut = defenv.SConscript( dirs = 'Docs/src/bin/halibut', build_dir = '$BUILD_PREFIX/halibut', duplicate = False, - exports = {'env' : defenv.Copy()} + exports = {'env' : defenv.Clone()} ) if defenv['CHMDOCS']: @@ -554,14 +554,14 @@ if defenv['CHMDOCS']: dirs = 'Docs/src', build_dir = '$BUILD_PREFIX/Docs/chm', duplicate = False, - exports = {'halibut' : halibut, 'env' : defenv.Copy(), 'build_chm' : True} + exports = {'halibut' : halibut, 'env' : defenv.Clone(), 'build_chm' : True} ) else: defenv.SConscript( dirs = 'Docs/src', build_dir = '$BUILD_PREFIX/Docs/html', duplicate = False, - exports = {'halibut' : halibut, 'env' : defenv.Copy(), 'build_chm' : False} + exports = {'halibut' : halibut, 'env' : defenv.Clone(), 'build_chm' : False} ) ###################################################################### @@ -570,7 +570,7 @@ else: defenv.SConscript( dirs = 'Examples', - exports = {'env': defenv.Copy()} + exports = {'env': defenv.Clone()} ) ###################################################################### @@ -579,7 +579,7 @@ defenv.SConscript( defenv.SConscript( dirs = 'Include', - exports = {'env': defenv.Copy()} + exports = {'env': defenv.Clone()} ) ###################################################################### @@ -599,7 +599,7 @@ for i in misc: # test code build_dir = '$BUILD_PREFIX/tests' -exports = {'env' : test_env.Copy()} +exports = {'env' : test_env.Clone()} defenv.SConscript( dirs = 'Source/Tests', @@ -612,7 +612,7 @@ defenv.Ignore('$BUILD_PREFIX', '$BUILD_PREFIX/tests') # test scripts -test_scripts_env = defenv.Copy(ENV = os.environ) # env needed for some scripts +test_scripts_env = defenv.Clone(ENV = os.environ) # env needed for some scripts test_scripts_env['ENV']['NSISDIR'] = os.path.abspath(str(defenv['TESTDISTDIR'])) test_scripts_env['ENV']['NSISCONFDIR'] = os.path.abspath(str(defenv['TESTDISTDIR'])) diff --git a/Source/SConscript b/Source/SConscript index 7e69c0f2..d8521220 100644 --- a/Source/SConscript +++ b/Source/SConscript @@ -80,7 +80,7 @@ env.Append(CPPDEFINES = ['_WIN32_IE=0x0500']) ##### LZMA specific defines -lzma_env = env.Copy() +lzma_env = env.Clone() lzma_env.Append(CPPDEFINES = ['COMPRESS_MF_BT']) lzma_files = lzma_env.Object(lzma_files)