mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-08-15 08:53:07 +09:00
Allow moz.configure to build projects at / or application/ without having to fully qualify the path in --enable-application
This commit is contained in:
parent
28bbfef589
commit
d8a1ba9bac
1 changed files with 15 additions and 4 deletions
|
|
@ -605,10 +605,21 @@ def include_project_configure(project, external_source_dir, build_env, help):
|
|||
if external_source_dir:
|
||||
base_dir = os.path.join(base_dir, external_source_dir[0])
|
||||
|
||||
path = os.path.join(base_dir, project[0], 'moz.configure')
|
||||
if not exists(path):
|
||||
die('Cannot find project %s', project[0])
|
||||
return path
|
||||
build_app = project[0]
|
||||
|
||||
# Uncomment when browser becomes application/basilisk
|
||||
#if build_app == 'browser':
|
||||
#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')
|
||||
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):
|
||||
return path_project_src_dir_root
|
||||
else:
|
||||
die('Cannot find project %s', build_app)
|
||||
|
||||
@depends('--with-external-source-dir')
|
||||
def external_source_dir(value):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue