summaryrefslogtreecommitdiff
path: root/acprep
diff options
context:
space:
mode:
Diffstat (limited to 'acprep')
-rwxr-xr-xacprep637
1 files changed, 378 insertions, 259 deletions
diff --git a/acprep b/acprep
index bf582cf5..c6baceca 100755
--- a/acprep
+++ b/acprep
@@ -36,6 +36,178 @@ LEVELS = {'DEBUG': logging.DEBUG,
'ERROR': logging.ERROR,
'CRITICAL': logging.CRITICAL}
+search_prefixes = [ '/opt/local',
+ '/usr/local',
+ '/sw',
+ '/usr' ]
+
+class BoostInfo(object):
+ log = None
+ suffix = ""
+ home_path = "/usr"
+ include_path = "include"
+ library_path = "lib"
+ configured = False
+
+ def __init__(self, log):
+ self.log = log
+
+ def configure(self, suffix = None, home_path = None,
+ include_path = None, library_path = None):
+ path = library_path or self.library_path
+ if not isabs(path):
+ path = join(home_path or self.home_path, path)
+ if not exists(path) or not isdir(path) or \
+ not self.check_for_boost_regex_lib(path, suffix or self.suffix):
+ return False
+
+ path = include_path or self.include_path
+ if not isabs(path):
+ path = join(home_path or self.home_path, path)
+ if not exists(path) or not isdir(path) or \
+ not self.check_for_boost_regex_hpp(path):
+ return False
+
+ self.log.debug('Configuring Boost details')
+ if suffix:
+ self.log.debug('Setting Boost suffix to => ' + suffix)
+ self.suffix = suffix
+ if home_path:
+ self.log.debug('Setting Boost home to => ' + home_path)
+ self.home_path = home_path
+ if include_path:
+ self.log.debug('Setting Boost include directory to => ' + include_path)
+ self.include_path = include_path
+ if library_path:
+ self.log.debug('Setting Boost lib directory to => ' + library_path)
+ self.library_path = library_path
+
+ self.configured = True
+
+ return True # The object was configured
+
+ def option_boost_suffix(self, option=None, opt_str=None, value=None, parser=None):
+ self.log.debug('Saw option --boost or --boost-suffix')
+ self.suffix = value
+
+ def option_boost_home(self, option=None, opt_str=None, value=None, parser=None):
+ self.log.debug('Saw option --boost-home')
+ self.home_path = value
+
+ def option_boost_include(self, option=None, opt_str=None, value=None, parser=None):
+ self.log.debug('Saw option --boost-include')
+ self.include_path = value
+
+ def option_boost_lib(self, option=None, opt_str=None, value=None, parser=None):
+ self.log.debug('Saw option --boost-lib')
+ self.library_path = value
+
+ def inform_boost_details(self):
+ self.log.info('Boost was found here:')
+ self.log.info('Boost include path => ' + self.include_directory())
+ self.log.info('Boost library path => ' + self.library_directory())
+ self.log.info('Boost suffix => ' + self.suffix)
+
+ def find_boost_in_directory(self, path):
+ if exists(path) and isdir(path):
+ for entry in reversed(sorted(os.listdir(path))):
+ if re.search('boost_regex', entry):
+ self.log.info('Found a Boost library: ' + entry)
+
+ match = re.match('libboost_regex([^.]*)\.(a|so|dylib)', entry)
+ if match:
+ suffix = match.group(1)
+ self.log.info('Found a Boost suffix => ' + suffix)
+ return suffix
+ else:
+ self.log.debug('The directory "%s" is not valid, skipping' % path)
+ return None
+
+ def locate_boost(self):
+ for path in map(lambda x: join(x, 'lib'), search_prefixes):
+ self.log.info('Looking for Boost in %s...' % path)
+ self.suffix = self.find_boost_in_directory(path)
+ if self.suffix is not None:
+ self.home_path = dirname(path)
+ self.configured = True
+ self.inform_boost_details()
+ break
+ if self.suffix is None:
+ self.log.error("Boost not found, try --boost-home (and --boost-suffix)")
+ sys.exit(1)
+
+ def check_for_boost_regex_lib(self, path, suffix):
+ regex_lib = join(path, 'libboost_regex' + suffix)
+ return (exists(regex_lib + '.a') or exists(regex_lib + '.lib') or
+ exists(regex_lib + '.so') or exists(regex_lib + '.dylib'))
+
+ def check_for_boost_regex_hpp(self, path):
+ regex_hpp = join(path, 'boost/regex.hpp')
+ return exists(regex_hpp)
+
+ def get_suffix(self):
+ if not self.configured:
+ self.locate_boost()
+ return self.suffix
+
+ def include_directory(self):
+ if not self.configured:
+ self.locate_boost()
+
+ if isabs(self.include_path):
+ path = self.include_path
+ else:
+ path = join(self.home_path, self.include_path)
+
+ if not exists(path) or not isdir(path):
+ self.log.error("Boost include directory '%s' not found, use --boost-include" % path)
+ sys.exit(1)
+
+ if not self.check_for_boost_regex_hpp(path):
+ self.log.error("Could not find Boost header 'boost/regex.hpp' in '%s'; use --boost-* flags" % path)
+ sys.exit(1)
+
+ return path
+
+ def library_directory(self):
+ if not self.configured:
+ self.locate_boost()
+
+ if isabs(self.library_path):
+ path = self.library_path
+ else:
+ path = join(self.home_path, self.library_path)
+
+ if not exists(path) or not isdir(path):
+ self.log.error("Boost library directory '%s' not found, use --boost-include" % path)
+ sys.exit(1)
+
+ if not self.check_for_boost_regex_lib(path, self.suffix):
+ self.log.error("Could not find Boost library 'boost_regex' in '%s'; use --boost-* flags" % path)
+ sys.exit(1)
+
+ return path
+
+ def dependencies(self, system):
+ if system == 'darwin':
+ return [ 'boost-jam', 'boost', '+icu+python26+st+universal' ]
+
+ if system == 'centos':
+ return [ 'boost-devel' ]
+
+ elif system == 'ubuntu-karmic':
+ return [ 'bjam', 'libboost1.40-dev',
+ 'libboost-regex1.40-dev',
+ 'libboost-date-time1.40-dev',
+ 'libboost-filesystem1.40-dev',
+ 'libboost-python1.40-dev' ]
+
+ elif system == 'ubuntu-hardy':
+ return [ 'bjam', 'libboost1.35-dev',
+ 'libboost-python1.35-dev',
+ 'libboost-regex1.35-dev',
+ 'libboost-date-time1.35-dev',
+ 'libboost-filesystem1.35-dev' ]
class CommandLineApp(object):
"Base class for building command line applications."
@@ -183,24 +355,23 @@ class PrepareBuild(CommandLineApp):
self.current_flavor = 'debug'
self.products_dir = None
self.build_dir = self.source_dir
- self.configure_args = ['--with-included-gettext']
+ self.configure_args = ['--with-included-gettext', '--enable-python']
+ self.boost_info = BoostInfo(self.log)
self.sys_include_dirs = []
self.sys_library_dirs = []
self.CPPFLAGS = []
- self.CCFLAGS = []
+ self.CFLAGS = []
self.CXXFLAGS = []
self.LDFLAGS = []
self.envvars = {
'PYTHON_HOME': '/usr',
'PYTHON_VERSION': '2.6',
- 'BOOST_SUFFIX': None,
- 'BOOST_HOME': '/usr',
'LEDGER_PRODUCTS': None,
'CC': 'gcc',
'CPPFLAGS': '',
- 'CCFLAGS': '',
+ 'CFLAGS': '',
'CXX': 'g++',
'CXXFLAGS': '',
'LD': 'g++',
@@ -226,14 +397,39 @@ class PrepareBuild(CommandLineApp):
CommandLineApp.__init__(self)
self.log.setLevel(logging.INFO)
+ self.force = False
+ self.no_pch = False
+ self.source_dir = os.getcwd()
+
+ self.initialize()
+
op = self.option_parser
+
+ # These options call into self.boost_info
+ op.add_option('', '--boost', metavar='BOOST_SUFFIX',
+ action="callback", type="string",
+ callback=self.boost_info.option_boost_suffix,
+ help='Set Boost library suffix (ex: "--boost=-mt")')
+ op.add_option('', '--boost-sufix', metavar='BOOST_SUFFIX',
+ action="callback", type="string",
+ callback=self.boost_info.option_boost_suffix,
+ help='Set Boost library suffix (ex: "--boost-suffix=-mt")')
+ op.add_option('', '--boost-home', metavar='BOOST_HOME',
+ action="callback", type="string",
+ callback=self.boost_info.option_boost_home,
+ help='Set Boost home directory (ex: "--boost-home=DIR")')
+ op.add_option('', '--boost-include', metavar='BOOST_INCLUDE',
+ action="callback", type="string",
+ callback=self.boost_info.option_boost_include,
+ help='Set Boost include path (ex: "--boost-include=DIR")')
+ op.add_option('', '--boost-lib', metavar='BOOST_LIB',
+ action="callback", type="string",
+ callback=self.boost_info.option_boost_lib,
+ help='Set Boost library path (ex: "--boost-lib=DIR")')
+
op.add_option('-j', '--jobs', metavar='N',
type='int', action='store', dest='jobs',
default=1, help='Allow N make jobs at once')
- op.add_option('', '--boost', metavar='SUFFIX',
- action="callback", type="string",
- callback=self.option_boost,
- help='Set Boost library suffix (ex: "--boost=-mt")')
op.add_option('', '--force', action="callback",
callback=self.option_force,
help="Perform every action, without checking")
@@ -277,12 +473,6 @@ class PrepareBuild(CommandLineApp):
callback=self.option_warn,
help='Enable full warning flags')
- self.force = False
- self.no_pch = False
- self.source_dir = os.getcwd()
-
- self.initialize()
-
def main(self, *args):
if args and args[0] in ['default', 'debug', 'opt', 'gcov', 'gprof']:
self.current_flavor = args[0]
@@ -291,7 +481,8 @@ class PrepareBuild(CommandLineApp):
if args:
cmd = args[0]
if not PrepareBuild.__dict__.has_key('phase_' + cmd):
- cmd = 'config'
+ self.log.error("Unknown build phase: " + cmd + "\n")
+ sys.exit(1)
else:
args = args[1:]
else:
@@ -549,44 +740,90 @@ class PrepareBuild(CommandLineApp):
if system == 'Darwin':
if exists('/opt/local/bin/port'):
self.log.info('Looks like you are using MacPorts on OS X')
- packages = [
+ packages = self.boost_info.dependencies('darwin') + [
'sudo', 'port', 'install', '-f',
- 'automake', 'autoconf', 'libtool', 'python26',
- 'libiconv', '+universal', 'zlib', '+universal',
- 'gmp' ,'+universal', 'mpfr', '+universal',
- 'ncurses', '+universal', 'ncursesw', '+universal',
- 'gettext' ,'+universal', 'libedit' ,'+universal',
- 'boost-jam', 'boost', '+st+python26+icu', 'cppunit',
- 'texlive', 'doxygen', 'graphviz', 'texinfo',
- 'lcov', 'sloccount'
+ 'automake',
+ 'autoconf',
+ 'libtool',
+ 'python26', '+universal',
+ 'libiconv', '+universal',
+ 'zlib', '+universal',
+ 'gmp' ,'+universal',
+ 'mpfr', '+universal',
+ 'ncurses', '+universal',
+ 'ncursesw', '+universal',
+ 'gettext' ,'+universal',
+ 'libedit' ,'+universal',
+ 'cppunit', '+universal',
+ #'texlive',
+ #'doxygen',
+ #'graphviz',
+ 'texinfo',
+ 'lcov',
+ 'sloccount'
]
self.log.info('Executing: ' + string.join(packages, ' '))
self.execute(*packages)
elif exists('/sw/bin/fink'):
self.log.info('Looks like you are using Fink on OS X')
self.log.error("I don't know the package names for Fink yet!")
+ sys.exit(1)
elif system == 'Linux':
if exists('/etc/issue'):
issue = open('/etc/issue')
if issue.readline().startswith('Ubuntu'):
- self.log.info('Looks like you are using APT on Ubuntu')
- packages = [
- 'sudo', 'apt-get', 'install',
- 'build-essential',
- 'libtool', 'autoconf', 'automake',
- 'zlib1g-dev', 'libbz2-dev', 'python-dev',
- 'libboost1.35-dev',
- 'libboost-python1.35-dev',
- 'libboost-regex1.35-dev',
- 'libboost-date-time1.35-dev',
- 'libboost-filesystem1.35-dev'
- 'libgmp3-dev', 'libmpfr-dev', 'gettext',
- 'libedit-dev', 'libcppunit-dev',
- #'texlive-full',
- #'doxygen', 'graphviz', 'texinfo',
- 'lcov', 'sloccount'
- ]
+ release = open('/etc/lsb-release')
+ info = release.read()
+ release.close()
+ if re.search('karmic', info):
+ self.log.info('Looks like you are using APT on Ubuntu Karmic')
+ packages = self.boost_info.dependencies('ubuntu-karmic') + [
+ 'sudo', 'apt-get', 'install',
+ 'build-essential',
+ 'libtool',
+ 'autoconf',
+ 'automake',
+ 'zlib1g-dev',
+ 'libbz2-dev',
+ 'python-dev',
+ 'libgmp3-dev',
+ 'libmpfr-dev',
+ 'gettext',
+ 'cvs',
+ 'libedit-dev',
+ 'libcppunit-dev',
+ #'texlive-full',
+ #'doxygen',
+ #'graphviz',
+ 'texinfo',
+ 'lcov',
+ 'sloccount'
+ ]
+ else:
+ self.log.info('Looks like you are using APT on Ubuntu Hardy')
+ packages = self.boost_info.dependencies('ubuntu-hardy') + [
+ 'sudo', 'apt-get', 'install',
+ 'build-essential',
+ 'libtool',
+ 'autoconf',
+ 'automake',
+ 'zlib1g-dev',
+ 'libbz2-dev',
+ 'python-dev',
+ 'cvs',
+ 'gettext',
+ 'libgmp3-dev',
+ 'libmpfr-dev',
+ 'libedit-dev',
+ 'libcppunit-dev',
+ #'texlive-full',
+ #'doxygen',
+ #'graphviz',
+ 'texinfo',
+ 'lcov',
+ 'sloccount'
+ ]
self.log.info('Executing: ' + string.join(packages, ' '))
self.execute(*packages)
@@ -595,138 +832,45 @@ class PrepareBuild(CommandLineApp):
if release.readline().startswith('CentOS'):
self.log.info('Looks like you are using YUM on CentOS')
packages = [
- 'sudo', 'yum', 'install', 'gcc', 'gcc-c++',
- 'compat-gcc-*', 'make', 'libtool', 'autoconf',
- 'automake', 'zlib-devel', 'bzip2-devel',
- 'python-devel', 'bboost-devel',
- 'gmp-devel', 'gettext-devel',
- #'mpfr-devel'
- 'libedit-devel', 'cppunit-devel',
- #'texlive-full',
- #'doxygen', 'graphviz', 'texinfo',
- #'lcov', 'sloccount'
+ 'sudo', 'yum', 'install',
+ 'gcc',
+ 'gcc-c++',
+ 'compat-gcc-*',
+ 'make',
+ 'libtool',
+ 'autoconf',
+ 'automake',
+ 'zlib-devel',
+ 'bzip2-devel',
+ 'python-devel',
+ 'gmp-devel',
+ 'gettext-devel',
+ #'mpfr-devel'
+ 'libedit-devel',
+ 'cppunit-devel',
+ #'texlive-full',
+ #'doxygen',
+ #'graphviz',
+ 'texinfo',
+ #'lcov',
+ #'sloccount'
]
self.log.info('Executing: ' + string.join(packages, ' '))
self.execute(*packages)
- def phase_buildlibs(self, *args):
- self.log.info('Executing phase: buildlibs')
-
- try:
- os.chdir('lib')
-
- environ, conf_args = self.configure_environment()
-
- boost = 'boost_1_40_0'
- tarball = boost + '.tar.bz2'
-
- if not exists(boost):
- if not exists(tarball):
- self.log.info('Downloading Boost source tarball ...')
- self.execute('curl', '-L', '-o', tarball,
- 'http://downloads.sourceforge.net/boost/' +
- boost + '.tar.bz2?use_mirror=ufpr')
-
- if not exists(tarball):
- self.log.error('Failed to locate the Boost source tarball')
- sys.exit(1)
-
- fd = open(tarball)
- try:
- csum = hashlib.md5()
- except:
- csum = md5.md5()
- csum.update(fd.read())
- fd.close()
- digest = csum.hexdigest()
-
- if digest != 'a17281fd88c48e0d866e1a12deecbcc0':
- self.log.error('Boost source tarball fails to match checksum')
- sys.exit(1)
-
- self.log.info('Extracting Boost source tarball ...')
- self.execute('tar', 'xjf', tarball)
-
- if not exists(boost):
- self.log.error('Failed to locate the Boost sources')
- sys.exit(1)
-
- if not exists('cppunit') and self.git_working_tree():
- self.execute('git', 'clone', 'git://github.com/jwiegley/cppunit.git')
-
- if not exists('cppunit'):
- self.log.error('Failed to locate the CppUnit sources')
- sys.exit(1)
-
- self.execute('make',
- 'BOOST_SOURCE=%s' % boost,
- 'CC=%s' % environ['CC'],
- 'CXX=%s' % environ['CXX'],
- 'LD=%s' % environ['LD'],
- 'build-all')
- finally:
- os.chdir(self.source_dir)
-
#########################################################################
# Determine the system's basic configuration #
#########################################################################
- def locate_boost_in_dir(self, path):
- if exists(path) and isdir(path):
- entries = os.listdir(path)
- entries.sort()
- for entry in entries:
- if re.search('boost_regex', entry):
- self.log.info('Found a Boost library: ' + entry)
-
- match = re.match('libboost_regex([^.]*)\.(a|so|dylib)', entry)
- if match:
- suffix = match.group(1)
- self.log.info('Found Boost suffix => ' + suffix)
- self.envvars['BOOST_HOME'] = dirname(path)
- return suffix
- else:
- self.log.debug('The directory "%s" is not valid, skipping' %
- path)
- return None
-
- def inform_boost_location(self, text, suffix):
- self.log.info('Boost %s here:' % text)
- self.log.info('BOOST_HOME => ' + self.envvars['BOOST_HOME'])
- self.log.info('BOOST_SUFFIX => ' + suffix)
-
- def locate_boost(self):
- if self.envvars['BOOST_SUFFIX']:
- self.log.info(("Not looking for Boost, since " +
- "a suffix of '%s' was given") %
- self.envvars['BOOST_SUFFIX'])
- else:
- suffix = None
- for path in ['/usr/local/lib', '/opt/local/lib',
- '/sw/lib', '/usr/lib']:
- self.log.info('Looking for Boost in %s...' % path)
- suffix = self.locate_boost_in_dir(path)
- if suffix is not None:
- self.inform_boost_location('was found', suffix)
- break
- if suffix is None:
- self.log.error("Boost could not be found.")
- self.envvars['BOOST_SUFFIX'] = suffix
- return self.envvars['BOOST_SUFFIX']
-
def setup_system_directories(self):
- boost_suffix = self.locate_boost()
-
# Each of these becomes '-isystem <name>'
for path in ['/usr/local/include',
- '%s/include/boost' %
- self.envvars['BOOST_HOME'],
- '%s/include' % self.envvars['BOOST_HOME'],
- '%s/include/python%s' %
- (self.envvars['PYTHON_HOME'],
- self.envvars['PYTHON_VERSION'].strip()),
- '/opt/local/include',
- '/sw/include']:
+ self.boost_info.include_directory(),
+ '%s/include/python%s' %
+ (self.envvars['PYTHON_HOME'],
+ self.envvars['PYTHON_VERSION'].strip()),
+ '/opt/local/include',
+ '/sw/include']:
if exists(path) and isdir(path) and \
path != '/usr/include':
self.log.info('Noticing include directory => ' + path)
@@ -739,13 +883,15 @@ class PrepareBuild(CommandLineApp):
% (self.envvars['PYTHON_HOME'],
self.envvars['PYTHON_VERSION'].strip()),
'/opt/local/lib',
+ self.boost_info.library_directory(),
'/sw/lib']:
- if exists(path) and isdir(path):
+ if exists(path) and isdir(path) and \
+ path not in self.sys_library_dirs:
self.log.info('Noticing library directory => ' + path)
self.sys_library_dirs.append(path)
def setup_for_johnw(self):
- if self.current_flavor != 'opt':
+ if self.current_flavor == 'debug' or self.current_flavor == 'gcov':
if exists('/usr/local/stow/cppunit/include'):
self.sys_include_dirs.insert(0, '/usr/local/stow/cppunit/include')
self.sys_library_dirs.insert(0, '/usr/local/stow/cppunit/lib')
@@ -755,17 +901,21 @@ class PrepareBuild(CommandLineApp):
self.sys_library_dirs.insert(0, '/usr/local/stow/icu/lib')
self.CPPFLAGS.append('-D_GLIBCXX_FULLY_DYNAMIC_STRING=1')
+ self.configure_args.append('--disable-shared')
self.options.use_glibcxx_debug = True
+ else:
+ self.CXXFLAGS.append('-march=nocona')
+ self.CXXFLAGS.append('-msse3')
- self.CXXFLAGS.append('-march=nocona')
- self.CXXFLAGS.append('-msse3')
-
- self.configure_args.append('--disable-shared')
self.configure_args.append('--enable-doxygen')
self.configure_args.append('--enable-python')
+ self.locate_darwin_libraries()
+
def setup_for_system(self):
+ if exists('/Users/johnw/Projects/ledger/plan/TODO'):
+ self.setup_for_johnw()
self.setup_system_directories()
system = self.get_stdout('uname', '-s')
@@ -789,12 +939,8 @@ class PrepareBuild(CommandLineApp):
self.CXXFLAGS.append('-pthread')
elif system == 'Darwin':
- if exists('/Users/johnw/Dropbox/Accounts/ledger.dat'):
- self.setup_for_johnw()
-
- self.locate_darwin_libraries()
-
- if self.current_flavor == 'opt' and \
+ if (self.current_flavor == 'opt' or \
+ self.current_flavor == 'default') and \
exists('/usr/bin/g++-4.2'):
self.envvars['CC'] = '/usr/bin/gcc-4.2'
self.envvars['CXX'] = '/usr/bin/g++-4.2'
@@ -853,7 +999,7 @@ class PrepareBuild(CommandLineApp):
def finalize_config(self):
self.setup_flavor()
- for var in ('CPPFLAGS', 'CCFLAGS', 'CXXFLAGS', 'LDFLAGS'):
+ for var in ('CPPFLAGS', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS'):
value = self.__dict__[var]
if value:
first = not self.envvars[var]
@@ -934,10 +1080,6 @@ class PrepareBuild(CommandLineApp):
self.CXXFLAGS.append('-Wno-strict-aliasing')
self.CXXFLAGS.append('-Werror')
- def option_boost(self, option=None, opt_str=None, value=None, parser=None):
- self.log.debug('Saw option --boost')
- self.envvars['BOOST_SUFFIX'] = value
-
def option_pic(self, option=None, opt_str=None, value=None, parser=None):
self.log.debug('Saw option --pic')
self.CXXFLAGS.append('-fPIC')
@@ -972,70 +1114,33 @@ class PrepareBuild(CommandLineApp):
#########################################################################
def locate_darwin_libraries(self):
- if self.current_flavor != 'opt':
- self.log.debug('We are using GLIBCXX_DEBUG, so setting up flags')
-
+ if self.current_flavor == 'debug' or self.current_flavor == 'gcov':
if self.options.use_glibcxx_debug:
+ self.log.debug('We are using GLIBCXX_DEBUG, so setting up flags')
self.CPPFLAGS.append('-D_GLIBCXX_DEBUG=1')
- if exists('/usr/local/stow/cppunit-debug/include'):
- if '/usr/local/stow/cppunit/include' in self.sys_include_dirs:
- self.sys_include_dirs.remove('/usr/local/stow/cppunit/include')
- self.sys_library_dirs.remove('/usr/local/stow/cppunit/lib')
-
- self.sys_include_dirs.insert(0, '/usr/local/stow/cppunit-debug/include')
- self.sys_library_dirs.insert(0, '/usr/local/stow/cppunit-debug/lib')
-
- if exists('/usr/local/stow/icu-debug/include'):
- if '/usr/local/stow/icu/include' in self.sys_include_dirs:
- self.sys_include_dirs.remove('/usr/local/stow/icu/include')
- self.sys_library_dirs.remove('/usr/local/stow/icu/lib')
-
- self.sys_include_dirs.insert(0, '/usr/local/stow/icu-debug/include')
- self.sys_library_dirs.insert(0, '/usr/local/stow/icu-debug/lib')
-
- if exists('/usr/local/lib/libboost_regex-xgcc44-sd-1_40.a'):
- self.envvars['BOOST_HOME'] = '/usr/local'
- self.envvars['BOOST_SUFFIX'] = '-xgcc44-sd-1_40'
- self.sys_include_dirs.append('/usr/local/include/boost-1_40')
- self.inform_boost_location('is really located',
- self.envvars['BOOST_SUFFIX'])
-
- elif exists('/usr/local/lib/libboost_regex-xgcc44-d-1_40.a'):
- self.envvars['BOOST_HOME'] = '/usr/local'
- self.envvars['BOOST_SUFFIX'] = '-xgcc44-d-1_40'
- self.sys_include_dirs.append('/usr/local/include/boost-1_40')
- self.inform_boost_location('is really located',
- self.envvars['BOOST_SUFFIX'])
-
- elif exists('/opt/local/lib/libboost_regex-d.a'):
- self.envvars['BOOST_HOME'] = '/opt/local'
- self.envvars['BOOST_SUFFIX'] = '-d'
- self.sys_include_dirs.append('/opt/local/include/boost')
- self.inform_boost_location('is really located',
- self.envvars['BOOST_SUFFIX'])
+ if self.boost_info.configure(home_path = '/usr/local/stow/boost_1_42_0',
+ suffix = '-xgcc44-sd-1_42',
+ include_path = 'include/boost-1_42'):
+ pass
+ elif self.boost_info.configure(home_path = '/usr/local/stow/boost_1_42_0',
+ suffix = '-xgcc44-d-1_42',
+ include_path = 'include/boost-1_42'):
+ pass
+ elif self.boost_info.configure(suffix = '-d'):
+ pass
else:
- if exists('/opt/local/lib/libboost_regex.a'):
- self.envvars['BOOST_HOME'] = '/opt/local'
- self.envvars['BOOST_SUFFIX'] = ''
- self.sys_include_dirs.append('/opt/local/include/boost')
- self.inform_boost_location('is really located',
- self.envvars['BOOST_SUFFIX'])
-
- elif exists('/usr/local/lib/libboost_regex-xgcc44-s-1_40.a'):
- self.envvars['BOOST_HOME'] = '/usr/local'
- self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_40'
- self.sys_include_dirs.append('/usr/local/include/boost-1_40')
- self.inform_boost_location('is really located',
- self.envvars['BOOST_SUFFIX'])
-
- elif exists('/usr/local/lib/libboost_regex-xgcc44-1_40.a'):
- self.envvars['BOOST_HOME'] = '/usr/local'
- self.envvars['BOOST_SUFFIX'] = '-xgcc44-1_40'
- self.sys_include_dirs.append('/usr/local/include/boost-1_40')
- self.inform_boost_location('is really located',
- self.envvars['BOOST_SUFFIX'])
+ if self.boost_info.configure():
+ pass
+ elif self.boost_info.configure(home_path = '/usr/local/stow/boost_1_42_0',
+ suffix = '-xgcc44-s-1_42',
+ include_path = 'include/boost-1_42'):
+ pass
+ elif self.boost_info.configure(home_path = '/usr/local/stow/boost_1_42_0',
+ suffix = '-xgcc44-1_42',
+ include_path = 'include/boost-1_42'):
+ pass
def setup_flavor_default(self):
pass
@@ -1048,13 +1153,23 @@ class PrepareBuild(CommandLineApp):
def setup_flavor_opt(self):
if self.darwin_gcc:
- self.CXXFLAGS.append('-fast')
- self.LDFLAGS.append('-fast')
+ self.option_no_pch()
+ if '--disable-shared' in self.configure_args:
+ self.configure_args.remove('--disable-shared')
+ self.configure_args.append('--disable-dependency-tracking')
+ for i in ['-fast']:
+ self.CXXFLAGS.append(i)
+ self.CFLAGS.append(i)
+ self.LDFLAGS.append(i)
+ for i in ['-arch', 'i386', '-arch', 'x86_64']:
+ self.CXXFLAGS.append(i)
+ self.CFLAGS.append(i)
+ self.LDFLAGS.append(i)
else:
- self.CXXFLAGS.append('-O3')
- self.LDFLAGS.append('-O3')
- self.CXXFLAGS.append('-fomit-frame-pointer')
- self.LDFLAGS.append('-fomit-frame-pointer')
+ for i in ['-O3', '-fomit-frame-pointer']:
+ self.CXXFLAGS.append(i)
+ self.CFLAGS.append(i)
+ self.LDFLAGS.append(i)
def setup_flavor_gcov(self):
self.CXXFLAGS.append('-g')
@@ -1121,15 +1236,15 @@ class PrepareBuild(CommandLineApp):
conf_args = ['sh', join(self.source_dir, 'configure'),
'--srcdir', self.source_dir]
- for var in ('CC', 'CPPFLAGS', 'CCFLAGS', 'CXX', 'CXXFLAGS',
+ for var in ('CC', 'CPPFLAGS', 'CFLAGS', 'CXX', 'CXXFLAGS',
'LD', 'LDFLAGS'):
if self.envvars.has_key(var) and self.envvars[var] and \
(var.endswith('FLAGS') or exists(self.envvars[var])):
conf_args.append('%s=%s' % (var, self.envvars[var]))
- if environ.has_key('BOOST_SUFFIX') and environ['BOOST_SUFFIX']:
+ if self.boost_info.get_suffix():
conf_args.append('--with-boost-suffix=%s' %
- environ['BOOST_SUFFIX'])
+ self.boost_info.get_suffix())
return (environ, conf_args + self.configure_args)
@@ -1150,6 +1265,10 @@ class PrepareBuild(CommandLineApp):
self.configured = True
+ environ, conf_args = self.configure_environment()
+ for arg in args:
+ if arg: conf_args.append(arg)
+
build_dir = self.ensure(self.build_directory())
try:
os.chdir(build_dir)
@@ -1159,11 +1278,6 @@ class PrepareBuild(CommandLineApp):
self.log.info('./configure must be run ' + reason)
self.log.debug('Source => ' + self.source_dir)
self.log.debug('Build => ' + build_dir)
-
- environ, conf_args = self.configure_environment()
- for arg in args:
- if arg: conf_args.append(arg)
-
self.log.debug('configure env => ' + str(environ))
self.log.debug('configure args => ' + str(conf_args))
@@ -1178,6 +1292,11 @@ class PrepareBuild(CommandLineApp):
if not self.options.no_patch:
self.phase_patch()
+
+ # Wipe the pre-compiled header, if there is one
+ pch = join(self.build_directory(), 'system.hh.gch')
+ if exists(pch):
+ os.remove(pch)
else:
if not self.options.no_patch and \
self.isnewer('Makefile', '.timestamp'):
@@ -1327,11 +1446,10 @@ class PrepareBuild(CommandLineApp):
self.initialize() # reset everything
self.build_dir = None # use the build/ tree
self.current_flavor = flavor
+ self.option_release()
if reset and exists(self.build_directory()) and \
isdir(self.build_directory()):
- self.option_release()
-
self.log.info('=== Wiping build directory %s ===' %
self.build_directory())
shutil.rmtree(self.build_directory())
@@ -1378,21 +1496,22 @@ class PrepareBuild(CommandLineApp):
self.log.info('=== Copying source tree ===')
self.phase_rsync()
+
self.phase_makeall(reset=True, *args)
- self.configure_flavor('opt')
+ self.configure_flavor('opt', reset=False)
self.log.info('=== Testing opt ===')
self.phase_make('fullcheck')
- self.configure_flavor('gcov')
+ self.configure_flavor('gcov', reset=False)
self.log.info('=== Testing gcov ===')
self.phase_make('check')
- self.configure_flavor('debug')
+ self.configure_flavor('debug', reset=False)
self.log.info('=== Testing debug ===')
self.phase_make('fullcheck')
- self.configure_flavor('default')
+ self.configure_flavor('default', reset=False)
self.log.info('=== Testing default ===')
self.phase_make('fullcheck')
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-27 15:52:02 +0000