mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-24 18:55:30 +00:00
Bug 1204822 - Add LD_LIBRARY_PATH in build script. r=dustin, r=jlund
This commit is contained in:
parent
12ac23c449
commit
545f25a477
@ -264,6 +264,18 @@ class B2GBuildBaseScript(BuildbotMixin, MockMixin,
|
||||
self.gecko_config = self.query_remote_gecko_config()
|
||||
return self.gecko_config
|
||||
|
||||
def symlink_gtk3(self):
|
||||
dirs = self.query_abs_dirs()
|
||||
gtk3_path = os.path.join(dirs['abs_work_dir'], 'gtk3')
|
||||
gtk3_symlink_path = os.path.join(dirs['abs_work_dir'], 'gecko', 'gtk3')
|
||||
|
||||
if os.path.isdir(gtk3_path) and not os.path.isdir(gtk3_symlink_path):
|
||||
cmd = ["ln", "-sf", gtk3_path, gtk3_symlink_path]
|
||||
retval = self.run_command(cmd)
|
||||
if retval != 0:
|
||||
self.error("failed to create symlink")
|
||||
self.return_code = 2
|
||||
|
||||
def query_build_env(self):
|
||||
"""Retrieves the environment for building"""
|
||||
dirs = self.query_abs_dirs()
|
||||
@ -285,6 +297,13 @@ class B2GBuildBaseScript(BuildbotMixin, MockMixin,
|
||||
if self.buildbot_config and 'buildid' in self.buildbot_config.get('properties', {}):
|
||||
env['MOZ_BUILD_DATE'] = self.buildbot_config['properties']['buildid']
|
||||
|
||||
self.symlink_gtk3()
|
||||
env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH')
|
||||
if env['LD_LIBRARY_PATH'] is None:
|
||||
env['LD_LIBRARY_PATH'] = os.path.join(dirs['abs_work_dir'], 'gecko', 'gtk3', 'usr', 'local', 'lib')
|
||||
else:
|
||||
env['LD_LIBRARY_PATH'] += ':%s' % os.path.join(dirs['abs_work_dir'], 'gecko', 'gtk3', 'usr', 'local', 'lib')
|
||||
|
||||
return env
|
||||
|
||||
def query_hgweb_url(self, repo, rev, filename=None):
|
||||
|
@ -541,18 +541,6 @@ class B2GBuild(LocalesMixin, PurgeMixin,
|
||||
cmd.append(target)
|
||||
return cmd
|
||||
|
||||
def symlink_gtk3(self):
|
||||
dirs = self.query_abs_dirs()
|
||||
gtk3_path = os.path.join(dirs['abs_work_dir'], 'gtk3')
|
||||
gtk3_symlink_path = os.path.join(dirs['abs_work_dir'], 'gecko', 'gtk3')
|
||||
|
||||
if os.path.isdir(gtk3_path):
|
||||
cmd = ["ln", "-s", gtk3_path, gtk3_symlink_path]
|
||||
retval = self.run_command(cmd)
|
||||
if retval != 0:
|
||||
self.error("failed to create symlink")
|
||||
self.return_code = 2
|
||||
|
||||
def build(self):
|
||||
dirs = self.query_abs_dirs()
|
||||
gecko_config = self.load_gecko_config()
|
||||
@ -563,13 +551,7 @@ class B2GBuild(LocalesMixin, PurgeMixin,
|
||||
else:
|
||||
cmds = [self.generate_build_command(t) for t in build_targets]
|
||||
|
||||
self.symlink_gtk3()
|
||||
env = self.query_build_env()
|
||||
env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH')
|
||||
if env['LD_LIBRARY_PATH'] is None:
|
||||
env['LD_LIBRARY_PATH'] = os.path.join(dirs['abs_work_dir'], 'gecko', 'gtk3', 'usr', 'local', 'lib')
|
||||
else:
|
||||
env['LD_LIBRARY_PATH'] += ':%s' % os.path.join(dirs['abs_work_dir'], 'gecko', 'gtk3', 'usr', 'local', 'lib')
|
||||
if self.config.get('gaia_languages_file'):
|
||||
env['LOCALE_BASEDIR'] = dirs['gaia_l10n_base_dir']
|
||||
env['LOCALES_FILE'] = os.path.join(dirs['abs_work_dir'], 'gaia', self.config['gaia_languages_file'])
|
||||
|
Loading…
Reference in New Issue
Block a user