From 4c9b8d783c3bd20af8e195428532bd83a620373d Mon Sep 17 00:00:00 2001 From: kichik Date: Mon, 30 Apr 2007 18:02:08 +0000 Subject: [PATCH] added TOOLSET git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5140 212acab6-be3b-0410-9dea-997c60f758d6 --- SConstruct | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 26c8cea6..92ae24d3 100644 --- a/SConstruct +++ b/SConstruct @@ -53,7 +53,17 @@ doc = [ 'COPYING' ] -defenv = Environment() +###################################################################### +####### Build Environment ### +###################################################################### + +toolset = ARGUMENTS.get('TOOLSET', '') + +if toolset: + defenv = Environment(TOOLS = toolset.split(',') + ['zip']) +else: + defenv = Environment() + Export('defenv') ###################################################################### @@ -125,6 +135,7 @@ opts.Add(ListOption('SKIPMISC', 'A list of plug-ins that will not be built', 'no opts.Add(ListOption('SKIPDOC', 'A list of doc files that will not be built/installed', 'none', doc)) opts.Add(('SKIPTESTS', 'A comma-separated list of test files that will not be ran', 'none')) # build tools +opts.Add(('TOOLSET', 'A comma-separated list specific tools used for building instead of the default', None)) opts.Add(BoolOption('MSTOOLKIT', 'Use Microsoft Visual C++ Toolkit', 'no')) opts.Add(BoolOption('CHMDOCS', 'Build CHM documentation, requires hhc.exe', hhc)) opts.Add(PathOption('APPEND_CPPPATH', 'Additional paths to search for include files', None))