From 3095000536941370ea107dcf65b7edb342b3467c Mon Sep 17 00:00:00 2001 From: anders_k Date: Sat, 19 Nov 2011 20:22:56 +0000 Subject: [PATCH] Don't install "bin\substart.exe" git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6182 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/SubStart/SConscript | 2 +- SConstruct | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Contrib/SubStart/SConscript b/Contrib/SubStart/SConscript index b805b484..c125305c 100644 --- a/Contrib/SubStart/SConscript +++ b/Contrib/SubStart/SConscript @@ -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 diff --git a/SConstruct b/SConstruct index 01e668d1..cf5d9b14 100644 --- a/SConstruct +++ b/SConstruct @@ -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