Skip to content
Snippets Groups Projects
Commit d6d28677 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan
Browse files

Windows build: only run vstool.exe once per build type.

Reviewed by Mani.
parent 4c38e582
No related branches found
No related tags found
No related merge requests found
...@@ -543,14 +543,26 @@ def run_cmake(self, args=[]): ...@@ -543,14 +543,26 @@ def run_cmake(self, args=[]):
'''Override to add the vstool.exe call after running cmake.''' '''Override to add the vstool.exe call after running cmake.'''
PlatformSetup.run_cmake(self, args) PlatformSetup.run_cmake(self, args)
if self.unattended == 'OFF': if self.unattended == 'OFF':
for build_dir in self.build_dirs(): self.run_vstool()
vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') +
' --solution ' + def run_vstool(self):
os.path.join(build_dir,'SecondLife.sln') + for build_dir in self.build_dirs():
' --config ' + self.build_type + stamp = os.path.join(build_dir, 'vstool.txt')
' --startup secondlife-bin') try:
print 'Running %r in %r' % (vstool_cmd, getcwd()) prev_build = open(stamp).read().strip()
self.run(vstool_cmd) except IOError:
prev_build = ''
if prev_build == self.build_type:
# Only run vstool if the build type has changed.
continue
vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') +
' --solution ' +
os.path.join(build_dir,'SecondLife.sln') +
' --config ' + self.build_type +
' --startup secondlife-bin')
print 'Running %r in %r' % (vstool_cmd, getcwd())
self.run(vstool_cmd)
print >> open(stamp, 'w'), self.build_type
def run_build(self, opts, targets): def run_build(self, opts, targets):
cwd = getcwd() cwd = getcwd()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment