diff options
author | Steven Knight <knight@baldmt.com> | 2005-11-06 15:03:10 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2005-11-06 15:03:10 (GMT) |
commit | 0113b86def554ddcd54b3b9eace409e16bf8a5a7 (patch) | |
tree | cba9b80d7e152fb5724474ed9057f7478482adf0 /src/engine/SCons | |
parent | 65b2ec6b93efcb9947fb90126dfb6d00748769e8 (diff) | |
download | SCons-0113b86def554ddcd54b3b9eace409e16bf8a5a7.zip SCons-0113b86def554ddcd54b3b9eace409e16bf8a5a7.tar.gz SCons-0113b86def554ddcd54b3b9eace409e16bf8a5a7.tar.bz2 |
Add support for an explicit SCONS_HOME variable for writing the SCons execution line in Visual Studio project files. (Dobes Vandermeer) Two minor test fixes for win32 portability.
Diffstat (limited to 'src/engine/SCons')
-rw-r--r-- | src/engine/SCons/Tool/msvs.py | 25 | ||||
-rw-r--r-- | src/engine/SCons/Tool/msvs.xml | 12 |
2 files changed, 29 insertions, 8 deletions
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index e3a28ec..c2bd20e 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -66,6 +66,12 @@ def _hexdigest(s): r = r + h[(i >> 4) & 0xF] + h[i & 0xF] return r +def xmlify(s): + s = string.replace(s, "&", "&") # do this first + s = string.replace(s, "'", "'") + s = string.replace(s, '"', """) + return s + def _generateGUID(slnfile, name): """This generates a dummy GUID for the sln file to use. It is based on the MD5 signatures of the sln filename plus the name of @@ -84,7 +90,15 @@ def _generateGUID(slnfile, name): # things and ends up with "-c" as sys.argv[0]. Consequently, we have # the MSVS Project file invoke SCons the same way that scons.bat does, # which works regardless of how we were invoked. -exec_script_main = "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-__VERSION__'), join(sys.prefix, 'scons-__VERSION__'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons') ] + sys.path; import SCons.Script; SCons.Script.main()" +def getExecScriptMain(env, xml=None): + scons_home = env.get('SCONS_HOME') + if scons_home: + exec_script_main = "from os.path import join; import sys; sys.path = [ r'%s' ] + sys.path; import SCons.Script; SCons.Script.main()" % scons_home + else: + exec_script_main = "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-__VERSION__'), join(sys.prefix, 'scons-__VERSION__'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons') ] + sys.path; import SCons.Script; SCons.Script.main()" + if xml: + exec_script_main = xmlify(exec_script_main) + return exec_script_main # The string for the Python executable we tell the Project file to use # is either sys.executable or, if an external PYTHON_ROOT environment @@ -543,12 +557,6 @@ class _GenerateV7DSP(_DSPGenerator): outdir = self.configs[kind].outdir buildtarget = self.configs[kind].buildtarget - def xmlify(cmd): - cmd = string.replace(cmd, "&", "&") # do this first - cmd = string.replace(cmd, "'", "'") - cmd = string.replace(cmd, '"', """) - return cmd - env_has_buildtarget = self.env.has_key('MSVSBUILDTARGET') if not env_has_buildtarget: self.env['MSVSBUILDTARGET'] = buildtarget @@ -1466,7 +1474,7 @@ def generate(env): default_MSVS_SConscript = env.File('SConstruct') env['MSVSSCONSCRIPT'] = default_MSVS_SConscript - env['MSVSSCONS'] = '"%s" -c "%s"' % (python_executable, exec_script_main) + env['MSVSSCONS'] = '"%s" -c "%s"' % (python_executable, getExecScriptMain(env)) env['MSVSSCONSFLAGS'] = '-C "${MSVSSCONSCRIPT.dir.abspath}" -f ${MSVSSCONSCRIPT.name}' env['MSVSSCONSCOM'] = '$MSVSSCONS $MSVSSCONSFLAGS' env['MSVSBUILDCOM'] = '$MSVSSCONSCOM $MSVSBUILDTARGET' @@ -1497,6 +1505,7 @@ def generate(env): env['GET_MSVSSOLUTIONSUFFIX'] = GetMSVSSolutionSuffix env['MSVSPROJECTSUFFIX'] = '${GET_MSVSPROJECTSUFFIX}' env['MSVSSOLUTIONSUFFIX'] = '${GET_MSVSSOLUTIONSUFFIX}' + env['SCONS_HOME'] = os.environ.get('SCONS_HOME') def exists(env): try: diff --git a/src/engine/SCons/Tool/msvs.xml b/src/engine/SCons/Tool/msvs.xml index c972ac2..9af0960 100644 --- a/src/engine/SCons/Tool/msvs.xml +++ b/src/engine/SCons/Tool/msvs.xml @@ -534,3 +534,15 @@ and when using earlier versions of Visual Studio. </summary> </cvar> + +<cvar name="SCONS_HOME"> +<summary> +The (optional) path to the SCons library directory, +initialized from the external environment. +If set, this is used to construct a shorter and more +efficient search path in the +&cv-MSVSSCONS; +command line executed +from Microsoft Visual Studio project files. +</summary> +</cvar> |