Skip to content
Snippets Groups Projects
Commit be7e9a46 authored by Brad Kittenbrink's avatar Brad Kittenbrink
Browse files

Merge in disabling of universal builds.

PPC is now oficially deprecated.

svn merge -r 127807:128098  svn+ssh://svn.lindenlab.com/svn/linden/branches/brad/killppc-1
parent 363de6c3
No related branches found
No related tags found
No related merge requests found
...@@ -76,6 +76,7 @@ class PlatformSetup(object): ...@@ -76,6 +76,7 @@ class PlatformSetup(object):
build_type = build_types['relwithdebinfo'] build_type = build_types['relwithdebinfo']
standalone = 'OFF' standalone = 'OFF'
unattended = 'OFF' unattended = 'OFF'
universal = 'OFF'
project_name = 'SecondLife' project_name = 'SecondLife'
distcc = True distcc = True
cmake_opts = [] cmake_opts = []
...@@ -415,7 +416,7 @@ def os(self): ...@@ -415,7 +416,7 @@ def os(self):
return 'darwin' return 'darwin'
def arch(self): def arch(self):
if self.unattended == 'ON': if self.universal == 'ON':
return 'universal' return 'universal'
else: else:
return UnixSetup.arch(self) return UnixSetup.arch(self)
...@@ -429,11 +430,12 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple): ...@@ -429,11 +430,12 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
word_size=self.word_size, word_size=self.word_size,
unattended=self.unattended, unattended=self.unattended,
project_name=self.project_name, project_name=self.project_name,
universal='', universal=self.universal,
type=self.build_type.upper(), type=self.build_type.upper(),
) )
if self.unattended == 'ON': if self.universal == 'ON':
args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\'' args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\''
pass
#if simple: #if simple:
# return 'cmake %(opts)s %(dir)r' % args # return 'cmake %(opts)s %(dir)r' % args
return ('cmake -G %(generator)r ' return ('cmake -G %(generator)r '
...@@ -674,6 +676,7 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple): ...@@ -674,6 +676,7 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
--standalone build standalone, without Linden prebuild libraries --standalone build standalone, without Linden prebuild libraries
--unattended build unattended, do not invoke any tools requiring --unattended build unattended, do not invoke any tools requiring
a human response a human response
--universal build a universal binary on Mac OS X (unsupported)
-t | --type=NAME build type ("Debug", "Release", or "RelWithDebInfo") -t | --type=NAME build type ("Debug", "Release", or "RelWithDebInfo")
-m32 | -m64 build architecture (32-bit or 64-bit) -m32 | -m64 build architecture (32-bit or 64-bit)
-N | --no-distcc disable use of distcc -N | --no-distcc disable use of distcc
...@@ -719,7 +722,7 @@ def main(arguments): ...@@ -719,7 +722,7 @@ def main(arguments):
opts, args = getopt.getopt( opts, args = getopt.getopt(
arguments, arguments,
'?hNt:p:G:m:', '?hNt:p:G:m:',
['help', 'standalone', 'no-distcc', 'unattended', 'type=', 'incredibuild', 'generator=', 'project=']) ['help', 'standalone', 'no-distcc', 'unattended', 'universal', 'type=', 'incredibuild', 'generator=', 'project='])
except getopt.GetoptError, err: except getopt.GetoptError, err:
print >> sys.stderr, 'Error:', err print >> sys.stderr, 'Error:', err
print >> sys.stderr, """ print >> sys.stderr, """
...@@ -736,6 +739,8 @@ def main(arguments): ...@@ -736,6 +739,8 @@ def main(arguments):
setup.standalone = 'ON' setup.standalone = 'ON'
elif o in ('--unattended',): elif o in ('--unattended',):
setup.unattended = 'ON' setup.unattended = 'ON'
elif o in ('--universal',):
setup.universal = 'ON'
elif o in ('-m',): elif o in ('-m',):
if a in ('32', '64'): if a in ('32', '64'):
setup.word_size = int(a) setup.word_size = int(a)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment