dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use True/False instead of 1/0

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4270 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-09-17 08:50:41 +00:00
parent 0536d2a029
commit 9929eb7120
5 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/Library/RegTool/SConscript
View file

@ -14,4 +14,4 @@ libs = Split("""
Import('BuildUtil') 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')

2
Contrib/Math/SConscript
View file

@ -24,4 +24,4 @@ docs = Split("""
Import('BuildPlugin env') 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'])

2
Contrib/NSISdl/SConscript
View file

@ -22,4 +22,4 @@ docs = Split("""
Import('BuildPlugin') Import('BuildPlugin')
BuildPlugin(target, files, libs, docs = docs, cppused = 1) BuildPlugin(target, files, libs, docs = docs, cppused = True)

2
Contrib/System/SConscript
View file

@ -41,6 +41,6 @@ BuildPlugin(
examples, examples,
docs, docs,
entry = '_DllMainCRTStartup', entry = '_DllMainCRTStartup',
nodeflib = 0, nodeflib = False,
defines = ['SYSTEM_EXPORTS'] defines = ['SYSTEM_EXPORTS']
) )

30
SConstruct
View file

@ -253,7 +253,7 @@ def BuildStub(compression, solid):
exports = { 'env' : env, 'compression' : compression, 'solid_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.SideEffect('%s/stub_%s.map' % (build_dir, stub), target)
env.DistributeAs('Stubs/%s%s' % (compression, suffix), target) env.DistributeAs('Stubs/%s%s' % (compression, suffix), target)
@ -265,8 +265,8 @@ for stub in stubs:
if stub in defenv['SKIPSTUBS']: if stub in defenv['SKIPSTUBS']:
continue continue
BuildStub(stub, 0) BuildStub(stub, False)
BuildStub(stub, 1) BuildStub(stub, True)
defenv.DistributeAs('Stubs/uninst', 'Source/exehead/uninst.ico') 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' build_dir = '$BUILD_PREFIX/makensis'
exports = { 'env' : makensis_env } 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) 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, def BuildPlugin(target, source, libs, examples = None, docs = None,
entry = 'DllMain', res = None, res_target = None, entry = 'DllMain', res = None, res_target = None,
resources = None, defines = None, flags = None, resources = None, defines = None, flags = None,
nodeflib = 1, cppused = 0): nodeflib = True, cppused = False):
env = plugin_env.Copy() env = plugin_env.Copy()
if cppused and env['CPP_REQUIRES_STDLIB']: if cppused and env['CPP_REQUIRES_STDLIB']:
nodeflib = 0 nodeflib = False
AddEnvStandardFlags(env, defines, flags, entry, nodeflib) AddEnvStandardFlags(env, defines, flags, entry, nodeflib)
@ -355,7 +355,7 @@ for plugin in plugins:
build_dir = '$BUILD_PREFIX/' + plugin build_dir = '$BUILD_PREFIX/' + plugin
exports = {'BuildPlugin' : BuildPlugin, 'env' : plugin_env.Copy()} 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 ### ####### Utilities ###
@ -363,7 +363,7 @@ for plugin in plugins:
def BuildUtil(target, source, libs, entry = None, res = None, def BuildUtil(target, source, libs, entry = None, res = None,
resources = None, defines = None, flags = 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): examples = None, docs = None):
env = util_env.Copy() env = util_env.Copy()
@ -399,7 +399,7 @@ for util in utils:
build_dir = '$BUILD_PREFIX/' + util build_dir = '$BUILD_PREFIX/' + util
exports = {'BuildUtil' : BuildUtil, 'env' : util_env.Copy()} 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 ### ####### Documentation ###
@ -408,7 +408,7 @@ for util in utils:
halibut = defenv.SConscript( halibut = defenv.SConscript(
dirs = 'Docs/src/bin/halibut', dirs = 'Docs/src/bin/halibut',
build_dir = '$BUILD_PREFIX/halibut', build_dir = '$BUILD_PREFIX/halibut',
duplicate = 0, duplicate = False,
exports = {'env' : defenv.Copy()} exports = {'env' : defenv.Copy()}
) )
@ -416,15 +416,15 @@ if defenv['CHMDOCS']:
defenv.SConscript( defenv.SConscript(
dirs = 'Docs/src', dirs = 'Docs/src',
build_dir = '$BUILD_PREFIX/Docs/chm', build_dir = '$BUILD_PREFIX/Docs/chm',
duplicate = 0, duplicate = False,
exports = {'halibut' : halibut, 'env' : defenv.Copy(), 'build_chm' : 1} exports = {'halibut' : halibut, 'env' : defenv.Copy(), 'build_chm' : True}
) )
else: else:
defenv.SConscript( defenv.SConscript(
dirs = 'Docs/src', dirs = 'Docs/src',
build_dir = '$BUILD_PREFIX/Docs/html', build_dir = '$BUILD_PREFIX/Docs/html',
duplicate = 0, duplicate = False,
exports = {'halibut' : halibut, 'env' : defenv.Copy(), 'build_chm' : 0} exports = {'halibut' : halibut, 'env' : defenv.Copy(), 'build_chm' : False}
) )
###################################################################### ######################################################################
@ -466,7 +466,7 @@ exports = {'env' : defenv.Copy()}
defenv.SConscript( defenv.SConscript(
dirs = 'Source/Tests', dirs = 'Source/Tests',
duplicate = 0, duplicate = False,
exports = exports, exports = exports,
build_dir = build_dir build_dir = build_dir
) )