diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/docs/mozinfo.rst | 8 | ||||
| -rw-r--r-- | build/moz.configure/init.configure | 13 | ||||
| -rw-r--r-- | build/moz.configure/old.configure | 2 |
3 files changed, 6 insertions, 17 deletions
diff --git a/build/docs/mozinfo.rst b/build/docs/mozinfo.rst index d74ca75e60..85ceb66576 100644 --- a/build/docs/mozinfo.rst +++ b/build/docs/mozinfo.rst @@ -136,14 +136,6 @@ release_or_beta Always defined. -sm_promise - Whether spidermonkey promises have been enabled or not. This is set - by adding --enable-sm-promise to the mozconfig file. - - Values are ``true`` and ``false``. - - Always defined. - tests_enabled Whether tests are enabled for this build. diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index a275957b78..713b2ce617 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -631,17 +631,12 @@ def include_project_configure(project, external_source_dir, build_env, help): build_app = project[0] - # XXX: Change this when 'browser' becomes invalid as an alias - if build_app == 'browser': - build_app = 'basilisk' - #die('The project "browser" is no longer valid. Perhaps you meant "basilisk" or "palemoon"?') - - path_project_src_dir_application = os.path.join(base_dir, 'application/' + build_app, 'moz.configure') + 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_application): - return path_project_src_dir_application - elif exists(path_project_src_dir_root): + if exists(path_project_src_dir_root): return path_project_src_dir_root else: die('Cannot find project %s', build_app) diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index 552019a137..65add5cdc0 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -307,6 +307,8 @@ def old_configure_options(*options): '--enable-mapi', '--enable-calendar', '--enable-incomplete-external-linkage', + '--enable-mailnews', + '--enable-mailnews-oauth2', # Below are configure flags used by Pale Moon '--disable-browser-statusbar', |