From ef236bef4f2304c7d0cab3565ce2e6ff47df56e0 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sun, 10 Apr 2022 10:26:10 -0400 Subject: Re-enable non-comm-style XUL application builds with a warning A check was placed here to ensure the platform is built comm-style e.g. 'your-application/UXP'. There are packaging instances where old-style is still used. This re-enables the old-style with a visual warning indicating that any failure is the responsibility of the application maintainter as this style is not supported by the platform. --- build/moz.configure/init.configure | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 6c4f74c0d8..281f2c1ad7 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -617,9 +617,10 @@ 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') +option('--enable-noncomm-build', default=False, help='Allows non-comm-style builds (deprecated)') +@depends('--enable-noncomm-build','--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): +def build_project(noncomm_build, project, external_source_dir, build_env, help): if not project: die('--enable-project is required.') @@ -631,7 +632,12 @@ def build_project(project, external_source_dir, build_env, help): build_app = project[0] if not external_source_dir and build_app not in ('js'): - die('Cannot find project %s', build_app) + if noncomm_build: + log.info("=====WARNING WARNING WARNING=====") + log.info("UNSUPPORTED NONCOMM-BUILD: Application code SHOULD NOT be put inside the platform tree, and doing so may have unforseen consequences if/when platform code is changed.") + log.info("=====WARNING WARNING WARNING=====") + else: + die('Cannot find project %s', build_app) build_app_abspath = os.path.join(base_dir, build_app) -- cgit v1.2.3