diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-04-12 02:53:43 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-12 02:53:43 +0000 |
| commit | bed3776982d1ee2d0fdeecc91d9a11c6ff2f5e03 (patch) | |
| tree | ebb399b6c446b19fae629bcdd655ab3e8fa997b6 | |
| parent | d90ce1e30a9046a48b22135672c4cf72cc840b37 (diff) | |
| parent | ef236bef4f2304c7d0cab3565ce2e6ff47df56e0 (diff) | |
| download | uxp-bed3776982d1ee2d0fdeecc91d9a11c6ff2f5e03.tar.gz | |
Merge pull request 'Re-enable building of any XUL application via UXP toolkit' (#1856) from g4jc/UXP-contrib:build_blocker into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/1856
Reviewed-by: Moonchild <moonchild@palemoon.org>
| -rw-r--r-- | build/moz.configure/init.configure | 12 |
1 files 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) |