diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/moz.configure/init.configure | 43 | ||||
| -rw-r--r-- | build/moz.configure/old.configure | 1 | ||||
| -rw-r--r-- | build/mozconfig.common | 5 |
3 files changed, 28 insertions, 21 deletions
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 713b2ce61..2e6034e8e 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -610,7 +610,7 @@ imply_option('--enable-project', application) def default_project(build_env, help): if build_env.topobjdir.endswith('/js/src'): return 'js' - return 'browser' + return 'application/xulrunner' option('--enable-project', nargs=1, default=default_project, help='Project to build') @@ -618,28 +618,22 @@ option('--enable-project', nargs=1, default=default_project, option('--with-external-source-dir', env='EXTERNAL_SOURCE_DIR', nargs=1, help='External directory containing additional build files') -@depends('--enable-project', '--with-external-source-dir', - check_build_environment, '--help') +@depends('--enable-project', '--with-external-source-dir', check_build_environment, '--help') @imports(_from='os.path', _import='exists') def include_project_configure(project, external_source_dir, build_env, help): - if not project: - die('--enable-project is required.') - base_dir = build_env.topsrcdir + if external_source_dir: base_dir = os.path.join(base_dir, external_source_dir[0]) - + build_app = project[0] - if not external_source_dir and build_app not in ('xulrunner', 'js'): - die('Cannot find project %s', build_app) - path_project_src_dir_root = os.path.join(base_dir, build_app, 'moz.configure') if exists(path_project_src_dir_root): return path_project_src_dir_root else: - die('Cannot find project %s', build_app) + return os.path.join(build_env.topsrcdir, 'toolkit', 'moz.configure') @depends('--with-external-source-dir') def external_source_dir(value): @@ -649,12 +643,29 @@ def external_source_dir(value): set_config('EXTERNAL_SOURCE_DIR', external_source_dir) add_old_configure_assignment('EXTERNAL_SOURCE_DIR', external_source_dir) +@depends('--enable-project', '--with-external-source-dir', check_build_environment, '--help') +@imports(_from='os.path', _import='exists') +def build_project(project, external_source_dir, build_env, help): + if not project: + die('--enable-project is required.') + + base_dir = build_env.topsrcdir + + if external_source_dir: + base_dir = os.path.join(base_dir, external_source_dir[0]) + + build_app = project[0] + + if not external_source_dir and build_app not in ('xulrunner', 'js'): + die('Cannot find project %s', build_app) + + build_app_abspath = os.path.join(base_dir, build_app) + + if exists(build_app_abspath): + return os.path.relpath(build_app_abspath, build_env.topsrcdir) + else: + die('Cannot find project %s', build_app) -@depends(include_project_configure, check_build_environment, '--help') -def build_project(include_project_configure, build_env, help): - ret = os.path.dirname(os.path.relpath(include_project_configure, - build_env.topsrcdir)) - return ret set_config('MOZ_BUILD_APP', build_project) set_define('MOZ_BUILD_APP', build_project) diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index d0f6909b9..aba1edf85 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -157,6 +157,7 @@ def old_configure_options(*options): '--enable-accessibility', '--enable-address-sanitizer', '--enable-alsa', + '--enable-av1', '--enable-b2g-bt', '--enable-b2g-camera', '--enable-b2g-ril', diff --git a/build/mozconfig.common b/build/mozconfig.common index 3d2d0b289..1bdf69ddc 100644 --- a/build/mozconfig.common +++ b/build/mozconfig.common @@ -16,11 +16,6 @@ ac_add_options --enable-crashreporter ac_add_options --enable-release -# Disable checking that add-ons are signed by the trusted root -MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-0} -# Disable enforcing that add-ons are signed by the trusted root -MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0} - ac_add_options --enable-js-shell . "$topsrcdir/build/mozconfig.automation" |