From 0e047070543d23eb70f32d7df3d6b51f6997c6e1 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Thu, 5 Jun 2008 20:02:54 +0000
Subject: [PATCH] Autodetect an installed version of Visual Studio. Reviewed by
Palange.
---
indra/develop.py | 85 ++++++++++++++++++++++++++++++------------------
1 file changed, 54 insertions(+), 31 deletions(-)
diff --git a/indra/develop.py b/indra/develop.py
index 01e603a020..5c8dc7f2bc 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -397,29 +397,46 @@ class DarwinSetup(UnixSetup):
class WindowsSetup(PlatformSetup):
- def __init__(self):
- super(WindowsSetup, self).__init__()
- self.gens = {
- 'vc71' : {
- 'gen' : r'Visual Studio 7 .NET 2003',
- 'ver' : r'7.1'
- },
- 'vc80' : {
- 'gen' : r'Visual Studio 8 2005',
- 'ver' : r'8.0'
- },
- 'vc90' : {
- 'gen' : r'Visual Studio 9 2008',
- 'ver' : r'9.0'
- }
+ gens = {
+ 'vc71' : {
+ 'gen' : r'Visual Studio 7 .NET 2003',
+ 'ver' : r'7.1'
+ },
+ 'vc80' : {
+ 'gen' : r'Visual Studio 8 2005',
+ 'ver' : r'8.0'
+ },
+ 'vc90' : {
+ 'gen' : r'Visual Studio 9 2008',
+ 'ver' : r'9.0'
}
- self.gens['vs2003'] = self.gens['vc71']
- self.gens['vs2005'] = self.gens['vc80']
- self.gens['vs2008'] = self.gens['vc90']
+ }
+ gens['vs2003'] = gens['vc71']
+ gens['vs2005'] = gens['vc80']
+ gens['vs2008'] = gens['vc90']
- self.generator = 'vc71'
+ def __init__(self):
+ super(WindowsSetup, self).__init__()
+ self._generator = None
self.incredibuild = False
+ def _get_generator(self):
+ if self._generator is None:
+ for version in 'vc71 vc80 vc90'.split():
+ if self.find_visual_studio(version):
+ self._generator = version
+ print 'Building with ', self.gens[version]['gen']
+ break
+ else:
+ print >> sys.stderr, 'Cannot find a Visual Studio installation!'
+ eys.exit(1)
+ return self._generator
+
+ def _set_generator(self, gen):
+ self._generator = gen
+
+ generator = property(_get_generator, _set_generator)
+
def os(self):
return 'win32'
@@ -441,19 +458,14 @@ class WindowsSetup(PlatformSetup):
'-DUNATTENDED:BOOL=%(unattended)s '
'%(opts)s "%(dir)s"' % args)
- def get_build_cmd(self):
- if self.incredibuild:
- config = self.build_type
- if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]:
- config = '\"%s|Win32\"' % config
-
- return "buildconsole Secondlife.sln /build %s" % config
-
- value = ""
+ def find_visual_studio(self, gen=None):
+ if gen is None:
+ gen = self._generator
+ gen = gen.lower()
try:
import _winreg
key_str = (r'SOFTWARE\Microsoft\VisualStudio\%s\Setup\VS' %
- self.gens[self.generator.lower()]['ver'])
+ self.gens[gen]['ver'])
value_str = (r'EnvironmentDirectory')
print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
(key_str, value_str))
@@ -463,11 +475,22 @@ class WindowsSetup(PlatformSetup):
key = _winreg.OpenKey(reg, key_str)
value = _winreg.QueryValueEx(key, value_str)[0]
print 'Found: %s' % value
+ return value
except WindowsError, err:
- print "Didn't find Visual Studio installation."
+ print >> sys.stderr, "Didn't find ", self.gens[gen]['name']
+ return ''
+
+ def get_build_cmd(self):
+ if self.incredibuild:
+ config = self.build_type
+ if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]:
+ config = '\"%s|Win32\"' % config
+
+ return "buildconsole Secondlife.sln /build %s" % config
# devenv.com is CLI friendly, devenv.exe... not so much.
- return '"' + value + 'devenv.com" Secondlife.sln /build %s' % self.build_type
+ return ('"%sdevenv.com" Secondlife.sln /build %s' %
+ (self.find_visual_studio(), self.build_type))
# this override of run exists because the PlatformSetup version
# uses Unix/Mac only calls. Freakin' os module!
--
GitLab