Skip to content
Snippets Groups Projects
Commit c7c34d9a authored by Christian Goetze's avatar Christian Goetze
Browse files

Working around DEV-30401 by yanking the etch 32bit build code until the viewer also builds on etch

parent 518afb3a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/cmake/00-Common.cmake
+ 0
− 8
View file @ c7c34d9a
...@@ -202,14 +202,6 @@ if (LINUX OR DARWIN) ...@@ -202,14 +202,6 @@ if (LINUX OR DARWIN)
set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}")
if (WORD_SIZE EQUAL 32)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
elseif (WORD_SIZE EQUAL 64)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
endif (WORD_SIZE EQUAL 32)
endif (LINUX OR DARWIN) endif (LINUX OR DARWIN)
......
indra/cmake/MySQL.cmake
+ 9
− 12
View file @ c7c34d9a
# -*- cmake -*- # -*- cmake -*-
include(Linking) include(Linking)
include(Prebuilt) include(Prebuilt)
# We don't prebuild our own MySQL client library.
use_prebuilt_binary(mysql) use_prebuilt_binary(mysql)
if (LINUX) set(MYSQL_FIND_QUIETLY ON)
if (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") set(MYSQL_FIND_REQUIRED ON)
set(MYSQL_LIBRARIES mysqlclient)
set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) if (WINDOWS)
else (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1")
# Use the native MySQL library on a 64-bit system.
set(MYSQL_FIND_QUIETLY ON)
set(MYSQL_FIND_REQUIRED ON)
include(FindMySQL)
endif (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1")
elseif (WINDOWS)
set(MYSQL_LIBRARIES mysqlclient) set(MYSQL_LIBRARIES mysqlclient)
set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
elseif (DARWIN) elseif (DARWIN)
...@@ -23,4 +17,7 @@ elseif (DARWIN) ...@@ -23,4 +17,7 @@ elseif (DARWIN)
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libmysqlclient.a optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libmysqlclient.a
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libmysqlclient.a debug ${ARCH_PREBUILT_DIRS_DEBUG}/libmysqlclient.a
) )
endif (LINUX) else (WINDOWS)
set(MYSQL_FIND_REQUIRED)
include(FindMySQL)
endif (WINDOWS)
indra/cmake/Variables.cmake
+ 2
− 19
View file @ c7c34d9a
...@@ -45,28 +45,12 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") ...@@ -45,28 +45,12 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(ARCH i686) set(ARCH i686)
set(LL_ARCH ${ARCH}_win32) set(LL_ARCH ${ARCH}_win32)
set(LL_ARCH_DIR ${ARCH}-win32) set(LL_ARCH_DIR ${ARCH}-win32)
set(WORD_SIZE 32)
endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(LINUX ON BOOl FORCE) set(LINUX ON BOOl FORCE)
execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/
# If someone has specified a word size, use that to determine the OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
# architecture. Otherwise, let the architecture specify the word size.
if (WORD_SIZE EQUAL 32)
set(ARCH i686)
elseif (WORD_SIZE EQUAL 64)
set(ARCH x86_64)
else (WORD_SIZE EQUAL 32)
execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/
OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
if (ARCH STREQUAL x86_64)
set(WORD_SIZE 64)
else (ARCH STREQUAL x86_64)
set(WORD_SIZE 64)
endif (ARCH STREQUAL x86_64)
endif (WORD_SIZE EQUAL 32)
set(LL_ARCH ${ARCH}_linux) set(LL_ARCH ${ARCH}_linux)
set(LL_ARCH_DIR ${ARCH}-linux) set(LL_ARCH_DIR ${ARCH}-linux)
endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
...@@ -89,7 +73,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ...@@ -89,7 +73,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
set(LL_ARCH ${ARCH}_darwin) set(LL_ARCH ${ARCH}_darwin)
set(LL_ARCH_DIR universal-darwin) set(LL_ARCH_DIR universal-darwin)
set(WORD_SIZE 32)
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# Default deploy grid # Default deploy grid
......
indra/develop.py
+ 6
− 23
View file @ c7c34d9a
...@@ -79,7 +79,6 @@ class PlatformSetup(object): ...@@ -79,7 +79,6 @@ class PlatformSetup(object):
project_name = 'SecondLife' project_name = 'SecondLife'
distcc = True distcc = True
cmake_opts = [] cmake_opts = []
word_size = 32
def __init__(self): def __init__(self):
self.script_dir = os.path.realpath( self.script_dir = os.path.realpath(
...@@ -121,7 +120,6 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple): ...@@ -121,7 +120,6 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
opts=quote(opts), opts=quote(opts),
standalone=self.standalone, standalone=self.standalone,
unattended=self.unattended, unattended=self.unattended,
word_size=self.word_size,
type=self.build_type.upper(), type=self.build_type.upper(),
) )
#if simple: #if simple:
...@@ -129,7 +127,6 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple): ...@@ -129,7 +127,6 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
return ('cmake -DCMAKE_BUILD_TYPE:STRING=%(type)s ' return ('cmake -DCMAKE_BUILD_TYPE:STRING=%(type)s '
'-DSTANDALONE:BOOL=%(standalone)s ' '-DSTANDALONE:BOOL=%(standalone)s '
'-DUNATTENDED:BOOL=%(unattended)s ' '-DUNATTENDED:BOOL=%(unattended)s '
'-DWORD_SIZE:STRING=%(word_size)s '
'-G %(generator)r %(opts)s %(dir)r' % args) '-G %(generator)r %(opts)s %(dir)r' % args)
def run_cmake(self, args=[]): def run_cmake(self, args=[]):
...@@ -232,8 +229,6 @@ def arch(self): ...@@ -232,8 +229,6 @@ def arch(self):
cpu = 'i686' cpu = 'i686'
elif cpu == 'Power Macintosh': elif cpu == 'Power Macintosh':
cpu = 'ppc' cpu = 'ppc'
elif cpu == 'x86_64' and self.word_size == 32:
cpu = 'i686'
return cpu return cpu
def run(self, command, name=None): def run(self, command, name=None):
...@@ -268,7 +263,8 @@ def os(self): ...@@ -268,7 +263,8 @@ def os(self):
return 'linux' return 'linux'
def build_dirs(self): def build_dirs(self):
# Only build the server code if we have it. # Only build the server code if (a) we have it and (b) we're
# on 32-bit x86.
platform_build = '%s-%s' % (self.platform(), self.build_type.lower()) platform_build = '%s-%s' % (self.platform(), self.build_type.lower())
if self.arch() == 'i686' and self.is_internal_tree(): if self.arch() == 'i686' and self.is_internal_tree():
...@@ -289,8 +285,7 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple): ...@@ -289,8 +285,7 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
standalone=self.standalone, standalone=self.standalone,
unattended=self.unattended, unattended=self.unattended,
type=self.build_type.upper(), type=self.build_type.upper(),
project_name=self.project_name, project_name=self.project_name
word_size=self.word_size,
) )
if not self.is_internal_tree(): if not self.is_internal_tree():
args.update({'cxx':'g++', 'server':'OFF', 'viewer':'ON'}) args.update({'cxx':'g++', 'server':'OFF', 'viewer':'ON'})
...@@ -316,7 +311,6 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple): ...@@ -316,7 +311,6 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
'-G %(generator)r -DSERVER:BOOL=%(server)s ' '-G %(generator)r -DSERVER:BOOL=%(server)s '
'-DVIEWER:BOOL=%(viewer)s -DSTANDALONE:BOOL=%(standalone)s ' '-DVIEWER:BOOL=%(viewer)s -DSTANDALONE:BOOL=%(standalone)s '
'-DUNATTENDED:BOOL=%(unattended)s ' '-DUNATTENDED:BOOL=%(unattended)s '
'-DWORD_SIZE:STRING=%(word_size)s '
'-DROOT_PROJECT_NAME:STRING=%(project_name)s ' '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
'%(opts)s %(dir)r') '%(opts)s %(dir)r')
% args) % args)
...@@ -419,11 +413,10 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple): ...@@ -419,11 +413,10 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
generator=self.generator, generator=self.generator,
opts=quote(opts), opts=quote(opts),
standalone=self.standalone, standalone=self.standalone,
word_size=self.word_size,
unattended=self.unattended, unattended=self.unattended,
project_name=self.project_name, project_name=self.project_name,
universal='', universal='',
type=self.build_type.upper(), type=self.build_type.upper()
) )
if self.unattended == 'ON': if self.unattended == 'ON':
args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\'' args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\''
...@@ -433,7 +426,6 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple): ...@@ -433,7 +426,6 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
'-DCMAKE_BUILD_TYPE:STRING=%(type)s ' '-DCMAKE_BUILD_TYPE:STRING=%(type)s '
'-DSTANDALONE:BOOL=%(standalone)s ' '-DSTANDALONE:BOOL=%(standalone)s '
'-DUNATTENDED:BOOL=%(unattended)s ' '-DUNATTENDED:BOOL=%(unattended)s '
'-DWORD_SIZE:STRING=%(word_size)s '
'-DROOT_PROJECT_NAME:STRING=%(project_name)s ' '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
'%(universal)s ' '%(universal)s '
'%(opts)s %(dir)r' % args) '%(opts)s %(dir)r' % args)
...@@ -513,15 +505,13 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple): ...@@ -513,15 +505,13 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
opts=quote(opts), opts=quote(opts),
standalone=self.standalone, standalone=self.standalone,
unattended=self.unattended, unattended=self.unattended,
project_name=self.project_name, project_name=self.project_name
word_size=self.word_size,
) )
#if simple: #if simple:
# return 'cmake %(opts)s "%(dir)s"' % args # return 'cmake %(opts)s "%(dir)s"' % args
return ('cmake -G "%(generator)s" ' return ('cmake -G "%(generator)s" '
'-DSTANDALONE:BOOL=%(standalone)s ' '-DSTANDALONE:BOOL=%(standalone)s '
'-DUNATTENDED:BOOL=%(unattended)s ' '-DUNATTENDED:BOOL=%(unattended)s '
'-DWORD_SIZE:STRING=%(word_size)s '
'-DROOT_PROJECT_NAME:STRING=%(project_name)s ' '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
'%(opts)s "%(dir)s"' % args) '%(opts)s "%(dir)s"' % args)
...@@ -630,15 +620,13 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple): ...@@ -630,15 +620,13 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
opts=quote(opts), opts=quote(opts),
standalone=self.standalone, standalone=self.standalone,
unattended=self.unattended, unattended=self.unattended,
project_name=self.project_name, project_name=self.project_name
word_size=self.word_size,
) )
#if simple: #if simple:
# return 'cmake %(opts)s "%(dir)s"' % args # return 'cmake %(opts)s "%(dir)s"' % args
return ('cmake -G "%(generator)s" ' return ('cmake -G "%(generator)s" '
'-DUNATTENDED:BOOl=%(unattended)s ' '-DUNATTENDED:BOOl=%(unattended)s '
'-DSTANDALONE:BOOL=%(standalone)s ' '-DSTANDALONE:BOOL=%(standalone)s '
'-DWORD_SIZE:STRING=%(word_size)s '
'-DROOT_PROJECT_NAME:STRING=%(project_name)s ' '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
'%(opts)s "%(dir)s"' % args) '%(opts)s "%(dir)s"' % args)
...@@ -659,7 +647,6 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple): ...@@ -659,7 +647,6 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
--unattended build unattended, do not invoke any tools requiring --unattended build unattended, do not invoke any tools requiring
a human response a human response
-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)
-N | --no-distcc disable use of distcc -N | --no-distcc disable use of distcc
-G | --generator=NAME generator name -G | --generator=NAME generator name
Windows: VC71 or VS2003 (default), VC80 (VS2005) or Windows: VC71 or VS2003 (default), VC80 (VS2005) or
...@@ -711,10 +698,6 @@ def main(arguments): ...@@ -711,10 +698,6 @@ 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 ('-m32',):
setup.word_size = 32
elif o in ('-m64',):
setup.word_size = 64
elif o in ('-t', '--type'): elif o in ('-t', '--type'):
try: try:
setup.build_type = setup.build_types[a.lower()] setup.build_type = setup.build_types[a.lower()]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment