diff options
author | David Walter Seikel | 2013-04-20 22:54:58 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-04-20 22:54:58 +1000 |
commit | e3e59e2244b98b78175fecad22053a8edae1b365 (patch) | |
tree | ecba8d8461cba96c2ae8e0b9211e8f42ead9a260 /linden | |
parent | No need to run cmake twice, the user gets warned if they screw up. (diff) | |
download | meta-impy-e3e59e2244b98b78175fecad22053a8edae1b365.zip meta-impy-e3e59e2244b98b78175fecad22053a8edae1b365.tar.gz meta-impy-e3e59e2244b98b78175fecad22053a8edae1b365.tar.bz2 meta-impy-e3e59e2244b98b78175fecad22053a8edae1b365.tar.xz |
Cmake now puts the running of vstool into the make files for us, so no need to do it in python.
Diffstat (limited to 'linden')
-rwxr-xr-x | linden/indra/develop.py | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 7d57973..ba22202 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py | |||
@@ -662,25 +662,6 @@ class WindowsSetup(PlatformSetup): | |||
662 | raise CommandError('the command %r %s' % | 662 | raise CommandError('the command %r %s' % |
663 | (name, ret)) | 663 | (name, ret)) |
664 | 664 | ||
665 | def run_vstool(self): | ||
666 | for build_dir in self.build_dirs(): | ||
667 | stamp = os.path.join(build_dir, 'vstool.txt') | ||
668 | try: | ||
669 | prev_build = open(stamp).read().strip() | ||
670 | except IOError: | ||
671 | prev_build = '' | ||
672 | if prev_build == self.build_type: | ||
673 | # Only run vstool if the build type has changed. | ||
674 | continue | ||
675 | vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') + | ||
676 | ' --solution ' + | ||
677 | os.path.join(build_dir,'Imprudence.sln') + | ||
678 | ' --config ' + self.build_type + | ||
679 | ' --startup imprudence-bin') | ||
680 | print 'Running %r in %r' % (vstool_cmd, getcwd()) | ||
681 | self.run(vstool_cmd) | ||
682 | print >> open(stamp, 'w'), self.build_type | ||
683 | |||
684 | def run_build(self, opts, targets): | 665 | def run_build(self, opts, targets): |
685 | cwd = getcwd() | 666 | cwd = getcwd() |
686 | build_cmd = self.get_build_cmd() | 667 | build_cmd = self.get_build_cmd() |