diff options
| -rwxr-xr-x | indra/develop.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/indra/develop.py b/indra/develop.py index 8ae19524ed..77583b0664 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -63,8 +63,8 @@ class PlatformSetup(object): build_types[t.lower()] = t build_type = build_types['relwithdebinfo'] - standalone = 'FALSE' - unattended = 'FALSE' + standalone = 'OFF' + unattended = 'OFF' distcc = True cmake_opts = [] @@ -254,7 +254,7 @@ class LinuxSetup(UnixSetup): type=self.build_type.upper() ) if not self.is_internal_tree(): - args.update({'cxx':'g++', 'server':'FALSE', 'viewer':'TRUE'}) + args.update({'cxx':'g++', 'server':'OFF', 'viewer':'ON'}) else: if self.distcc: distcc = self.find_in_path('distcc') @@ -264,12 +264,12 @@ class LinuxSetup(UnixSetup): baseonly = False if 'server' in build_dir: gcc33 = distcc + self.find_in_path('g++-3.3', 'g++', baseonly) - args.update({'cxx':' '.join(gcc33), 'server':'TRUE', - 'viewer':'FALSE'}) + args.update({'cxx':' '.join(gcc33), 'server':'ON', + 'viewer':'OFF'}) else: gcc41 = distcc + self.find_in_path('g++-4.1', 'g++', baseonly) - args.update({'cxx': ' '.join(gcc41), 'server':'FALSE', - 'viewer':'TRUE'}) + args.update({'cxx': ' '.join(gcc41), 'server':'OFF', + 'viewer':'ON'}) #if simple: # return (('cmake %(opts)s ' # '-DSERVER:BOOL=%(server)s ' @@ -369,7 +369,7 @@ class DarwinSetup(UnixSetup): return 'darwin' def arch(self): - if self.unattended == 'TRUE': + if self.unattended == 'ON': return 'universal' else: return UnixSetup.arch(self) @@ -384,7 +384,7 @@ class DarwinSetup(UnixSetup): universal='', type=self.build_type.upper() ) - if self.unattended == 'TRUE': + if self.unattended == 'ON': args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\'' #if simple: # return 'cmake %(opts)s %(dir)r' % args @@ -523,7 +523,7 @@ class WindowsSetup(PlatformSetup): def run_cmake(self, args=[]): '''Override to add the vstool.exe call after running cmake.''' PlatformSetup.run_cmake(self, args) - if self.unattended == 'FALSE': + if self.unattended == 'OFF': for build_dir in self.build_dirs(): vstool_cmd = os.path.join('tools','vstool','VSTool.exe') \ + ' --solution ' \ @@ -604,7 +604,7 @@ If you do not specify a command, the default is "configure". Examples: Set up a viewer-only project for your system: - develop.py configure -DSERVER:BOOL=FALSE + develop.py configure -DSERVER:BOOL=OFF ''' def main(arguments): @@ -618,7 +618,7 @@ def main(arguments): print >> sys.stderr, 'Error:', err print >> sys.stderr, """ Note: You must pass -D options to cmake after the "configure" command -For example: develop.py configure -DSERVER:BOOL=FALSE""" +For example: develop.py configure -DSERVER:BOOL=OFF""" sys.exit(1) for o, a in opts: @@ -626,9 +626,9 @@ For example: develop.py configure -DSERVER:BOOL=FALSE""" print usage_msg.strip() sys.exit(0) elif o in ('--standalone',): - setup.standalone = 'TRUE' + setup.standalone = 'ON' elif o in ('--unattended',): - setup.unattended = 'TRUE' + setup.unattended = 'ON' elif o in ('-t', '--type'): try: setup.build_type = setup.build_types[a.lower()] |