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

Don't install "bin\substart.exe"

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6182 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2011-11-19 20:22:56 +00:00
parent 020864c3da
commit 3095000536
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/SubStart/SConscript
View file

@ -11,6 +11,6 @@ libs = Split("""
Import('BuildUtil')
substart = BuildUtil(target, files, libs, cli = True)
substart = BuildUtil(target, files, libs, cli = True, noinstall = True)
env.DistributeBin(substart, names=['makensis.exe'], alias='install-compiler') # install as makensis

19
SConstruct
View file

@ -670,7 +670,7 @@ def BuildUtil(target, source, libs, entry = None, res = None,
resources = None, defines = None, flags = None,
nodeflib = False, file_name = '', path='', contrib = False,
examples = None, docs = None, cross_platform = False,
root_util = False, cli = False):
root_util = False, cli = False, noinstall = False):
env = BuildUtilEnv(defines, flags, libs, entry, nodeflib, cross_platform, cli)
AppendRES(env, source, res, resources)
@ -691,14 +691,15 @@ def BuildUtil(target, source, libs, entry = None, res = None,
CleanMap(env, util, target)
if contrib:
ins = env.DistributeContrib(util, path=path, alias='install-utils')
elif cross_platform and not env['PLATFORM'] == 'win32' or root_util and env['PLATFORM'] == 'win32':
ins = env.DistributeBin(util, path=path, alias='install-utils')
else:
ins = env.DistributeW32Bin(util, path=path, alias='install-utils')
DistributeExtras(env, target, examples, docs)
if not noinstall:
if contrib:
ins = env.DistributeContrib(util, path=path, alias='install-utils')
elif cross_platform and not env['PLATFORM'] == 'win32' or root_util and env['PLATFORM'] == 'win32':
ins = env.DistributeBin(util, path=path, alias='install-utils')
else:
ins = env.DistributeW32Bin(util, path=path, alias='install-utils')
DistributeExtras(env, target, examples, docs)
return util