Moved logLevel commandline option from NVDA's root sconstruct to nvdaHelper's, renami...

diff --git a/nvdaHelper/archBuild_sconscript b/nvdaHelper/archBuild_sconscript
index b077306..1921e17 100644 (file)
--- a/nvdaHelper/archBuild_sconscript
+++ b/nvdaHelper/archBuild_sconscript
@@ -23,7 +23,7 @@ TARGET_ARCH=env['TARGET_ARCH']
 debug=env['nvdaHelperDebug']\r
 \r
 #Some defines and includes for the environment\r
-env.Append(CPPDEFINES=['UNICODE','_CRT_SECURE_NO_DEPRECATE',('LOGLEVEL','${logLevel}')])\r
+env.Append(CPPDEFINES=['UNICODE','_CRT_SECURE_NO_DEPRECATE',('LOGLEVEL','${nvdaHelperLogLevel}')])\r
 env.Append(CXXFLAGS=['/EHsc'])\r
 env.Append(CPPPATH=['#/include',Dir('.').abspath])\r
 env.Append(LINKFLAGS='/incremental:no')\r

diff --git a/nvdaHelper/sconscript b/nvdaHelper/sconscript
index 470af27..3fd1ec9 100644 (file)
--- a/nvdaHelper/sconscript
+++ b/nvdaHelper/sconscript
@@ -32,6 +32,7 @@ archClientInstallDirs={
 \r
 vars = Variables()\r
 vars.Add(BoolVariable("nvdaHelperDebug", "If true assertions are enabled, debug libraries are used, debug symbols are produced, and no optimization will occure", False))\r
+vars.Add(EnumVariable('nvdaHelperLogLevel','The level of logging you wish to see, lower is more verbose','15',allowed_values=[str(x) for x in xrange(60)]))\r
 \r
 #Build nvdaHelper for needed architectures\r
 for arch in env['targetArchitectures']: \r

diff --git a/sconstruct b/sconstruct
index e155652..261d49e 100755 (executable)
--- a/sconstruct
+++ b/sconstruct
@@ -78,7 +78,6 @@ vars.Add(PathVariable("certFile", "The certificate file with which to sign execu
        lambda key, val, env: not val or PathVariable.PathIsFile(key, val, env)))\r
 vars.Add(PathVariable("outputDir", "The directory where the final built archives and such will be placed", "output",PathVariable.PathIsDirCreate))\r
 vars.Add(ListVariable('targetArchitectures','Which architectures should NVDA support?','all',['x86','x86_64']))\r
-vars.Add(EnumVariable('logLevel','The level of logging you wish to see, lower is more verbose','15',allowed_values=[str(x) for x in xrange(60)]))\r
 \r
 #Check for any unknown variables\r
 unknown=vars.UnknownVariables().keys()\r