aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-04-20 23:00:01 +1000
committerDavid Walter Seikel2013-04-20 23:00:01 +1000
commit52fbc90af39ed076c039ea5b4f69bb4fb8d6518d (patch)
tree6c67848f8413712c5a958ed9a478421b845eba72 /linden
parentDo the right vs finding thing even if it's an nmake build. (diff)
downloadmeta-impy-52fbc90af39ed076c039ea5b4f69bb4fb8d6518d.zip
meta-impy-52fbc90af39ed076c039ea5b4f69bb4fb8d6518d.tar.gz
meta-impy-52fbc90af39ed076c039ea5b4f69bb4fb8d6518d.tar.bz2
meta-impy-52fbc90af39ed076c039ea5b4f69bb4fb8d6518d.tar.xz
Small clean ups.
Diffstat (limited to 'linden')
-rwxr-xr-xlinden/indra/develop.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 470f66a..eb071bd 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -408,7 +408,7 @@ class LinuxSetup(UnixSetup):
408 print 'Running %r' % cmd 408 print 'Running %r' % cmd
409 self.run(cmd) 409 self.run(cmd)
410 410
411 411
412class DarwinSetup(UnixSetup): 412class DarwinSetup(UnixSetup):
413 def __init__(self): 413 def __init__(self):
414 super(DarwinSetup, self).__init__() 414 super(DarwinSetup, self).__init__()
@@ -599,7 +599,6 @@ class WindowsSetup(PlatformSetup):
599 '-DROOT_PROJECT_NAME:STRING=%(project_name)s ' 599 '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
600 '-DUSING_EXPRESS:BOOL=%(using_express)s ' 600 '-DUSING_EXPRESS:BOOL=%(using_express)s '
601 '-DUSE_VSTOOL:BOOL=%(use_vstool)s ' 601 '-DUSE_VSTOOL:BOOL=%(use_vstool)s '
602 #'-DPACKAGE:BOOL=ON '
603 '%(opts)s "%(dir)s"' % args) 602 '%(opts)s "%(dir)s"' % args)
604 603
605 def get_build_cmd(self): 604 def get_build_cmd(self):
@@ -607,7 +606,6 @@ class WindowsSetup(PlatformSetup):
607 config = self.build_type 606 config = self.build_type
608 if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0', r'10.0', r'7.1' ]: 607 if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0', r'10.0', r'7.1' ]:
609 config = '\"%s|Win32\"' % config 608 config = '\"%s|Win32\"' % config
610
611 return "buildconsole %s.sln /build %s" % (self.project_name, config) 609 return "buildconsole %s.sln /build %s" % (self.project_name, config)
612 610
613 environment = self.find_visual_studio(self.generator) 611 environment = self.find_visual_studio(self.generator)
@@ -625,14 +623,14 @@ class WindowsSetup(PlatformSetup):
625 exit(0) 623 exit(0)
626 624
627 if self.generator == 'nmake': 625 if self.generator == 'nmake':
628 '''Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds.''' 626 # Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds.
629 self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make') 627 self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make')
630 self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make') 628 self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make')
631 self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make') 629 self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make')
632 self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make') 630 self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make')
633 '''Evil hack.''' 631 # Evil hack.
634 self.run(r'touch newview/touched.bat') 632 self.run(r'touch newview/touched.bat')
635 return "nmake" 633 return 'nmake'
636 634
637 # devenv.com is CLI friendly, devenv.exe... not so much. 635 # devenv.com is CLI friendly, devenv.exe... not so much.
638 return ('"%sdevenv.com" %s.sln /build %s' % 636 return ('"%sdevenv.com" %s.sln /build %s' %