From 9929eb7120c9bf45f9579029057c432009c9ca19 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 17 Sep 2005 08:50:41 +0000 Subject: [PATCH] use True/False instead of 1/0 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4270 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Library/RegTool/SConscript | 2 +- Contrib/Math/SConscript | 2 +- Contrib/NSISdl/SConscript | 2 +- Contrib/System/SConscript | 2 +- SConstruct | 30 +++++++++++++++--------------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Contrib/Library/RegTool/SConscript b/Contrib/Library/RegTool/SConscript index 625609da..6dcbfa28 100644 --- a/Contrib/Library/RegTool/SConscript +++ b/Contrib/Library/RegTool/SConscript @@ -14,4 +14,4 @@ libs = Split(""" Import('BuildUtil') -BuildUtil(target, files, libs, entry = 'WinMain', nodeflib = 1, install_as = 'Bin/RegTool.bin') +BuildUtil(target, files, libs, entry = 'WinMain', nodeflib = True, install_as = 'Bin/RegTool.bin') diff --git a/Contrib/Math/SConscript b/Contrib/Math/SConscript index 21dede22..ebb80a0a 100644 --- a/Contrib/Math/SConscript +++ b/Contrib/Math/SConscript @@ -24,4 +24,4 @@ docs = Split(""" Import('BuildPlugin env') -BuildPlugin(target, files, libs, examples, docs, nodeflib = 0, flags = ['$CPP_FLAG']) +BuildPlugin(target, files, libs, examples, docs, nodeflib = False, flags = ['$CPP_FLAG']) diff --git a/Contrib/NSISdl/SConscript b/Contrib/NSISdl/SConscript index a4194cdf..e18bae07 100644 --- a/Contrib/NSISdl/SConscript +++ b/Contrib/NSISdl/SConscript @@ -22,4 +22,4 @@ docs = Split(""" Import('BuildPlugin') -BuildPlugin(target, files, libs, docs = docs, cppused = 1) +BuildPlugin(target, files, libs, docs = docs, cppused = True) diff --git a/Contrib/System/SConscript b/Contrib/System/SConscript index eed4da62..bda6a8ee 100644 --- a/Contrib/System/SConscript +++ b/Contrib/System/SConscript @@ -41,6 +41,6 @@ BuildPlugin( examples, docs, entry = '_DllMainCRTStartup', - nodeflib = 0, + nodeflib = False, defines = ['SYSTEM_EXPORTS'] ) diff --git a/SConstruct b/SConstruct index 9d7353ac..782ab592 100644 --- a/SConstruct +++ b/SConstruct @@ -253,7 +253,7 @@ def BuildStub(compression, solid): exports = { 'env' : env, 'compression' : compression, 'solid_compression' : solid } - target = defenv.SConscript(dirs = 'Source/exehead', build_dir = build_dir, duplicate = 0, exports = exports) + target = defenv.SConscript(dirs = 'Source/exehead', build_dir = build_dir, duplicate = False, exports = exports) env.SideEffect('%s/stub_%s.map' % (build_dir, stub), target) env.DistributeAs('Stubs/%s%s' % (compression, suffix), target) @@ -265,8 +265,8 @@ for stub in stubs: if stub in defenv['SKIPSTUBS']: continue - BuildStub(stub, 0) - BuildStub(stub, 1) + BuildStub(stub, False) + BuildStub(stub, True) defenv.DistributeAs('Stubs/uninst', 'Source/exehead/uninst.ico') @@ -277,7 +277,7 @@ defenv.DistributeAs('Stubs/uninst', 'Source/exehead/uninst.ico') build_dir = '$BUILD_PREFIX/makensis' exports = { 'env' : makensis_env } -makensis = defenv.SConscript(dirs = 'Source', build_dir = build_dir, duplicate = 0, exports = exports) +makensis = defenv.SConscript(dirs = 'Source', build_dir = build_dir, duplicate = False, exports = exports) makensis_env.SideEffect('%s/makensis.map' % build_dir, makensis) @@ -325,11 +325,11 @@ def DistributeExtras(env, target, examples, docs): def BuildPlugin(target, source, libs, examples = None, docs = None, entry = 'DllMain', res = None, res_target = None, resources = None, defines = None, flags = None, - nodeflib = 1, cppused = 0): + nodeflib = True, cppused = False): env = plugin_env.Copy() if cppused and env['CPP_REQUIRES_STDLIB']: - nodeflib = 0 + nodeflib = False AddEnvStandardFlags(env, defines, flags, entry, nodeflib) @@ -355,7 +355,7 @@ for plugin in plugins: build_dir = '$BUILD_PREFIX/' + plugin exports = {'BuildPlugin' : BuildPlugin, 'env' : plugin_env.Copy()} - defenv.SConscript(dirs = path, build_dir = build_dir, duplicate = 0, exports = exports) + defenv.SConscript(dirs = path, build_dir = build_dir, duplicate = False, exports = exports) ###################################################################### ####### Utilities ### @@ -363,7 +363,7 @@ for plugin in plugins: def BuildUtil(target, source, libs, entry = None, res = None, resources = None, defines = None, flags = None, - nodeflib = 0, install = None, install_as = None, + nodeflib = False, install = None, install_as = None, examples = None, docs = None): env = util_env.Copy() @@ -399,7 +399,7 @@ for util in utils: build_dir = '$BUILD_PREFIX/' + util exports = {'BuildUtil' : BuildUtil, 'env' : util_env.Copy()} - defenv.SConscript(dirs = path, build_dir = build_dir, duplicate = 0, exports = exports) + defenv.SConscript(dirs = path, build_dir = build_dir, duplicate = False, exports = exports) ###################################################################### ####### Documentation ### @@ -408,7 +408,7 @@ for util in utils: halibut = defenv.SConscript( dirs = 'Docs/src/bin/halibut', build_dir = '$BUILD_PREFIX/halibut', - duplicate = 0, + duplicate = False, exports = {'env' : defenv.Copy()} ) @@ -416,15 +416,15 @@ if defenv['CHMDOCS']: defenv.SConscript( dirs = 'Docs/src', build_dir = '$BUILD_PREFIX/Docs/chm', - duplicate = 0, - exports = {'halibut' : halibut, 'env' : defenv.Copy(), 'build_chm' : 1} + duplicate = False, + exports = {'halibut' : halibut, 'env' : defenv.Copy(), 'build_chm' : True} ) else: defenv.SConscript( dirs = 'Docs/src', build_dir = '$BUILD_PREFIX/Docs/html', - duplicate = 0, - exports = {'halibut' : halibut, 'env' : defenv.Copy(), 'build_chm' : 0} + duplicate = False, + exports = {'halibut' : halibut, 'env' : defenv.Copy(), 'build_chm' : False} ) ###################################################################### @@ -466,7 +466,7 @@ exports = {'env' : defenv.Copy()} defenv.SConscript( dirs = 'Source/Tests', - duplicate = 0, + duplicate = False, exports = exports, build_dir = build_dir )