diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-12-16 20:09:38 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-12-16 20:09:38 -0500 |
| commit | e2de507e0261c9b138cd3cf5356c21eca3e7a28d (patch) | |
| tree | f32816881d4f8512d42ece948a41ae21c977c633 /build | |
| parent | 06494f307850c576868831bd28a61464eab1f359 (diff) | |
| download | UXP-e2de507e0261c9b138cd3cf5356c21eca3e7a28d.tar UXP-e2de507e0261c9b138cd3cf5356c21eca3e7a28d.tar.gz UXP-e2de507e0261c9b138cd3cf5356c21eca3e7a28d.tar.lz UXP-e2de507e0261c9b138cd3cf5356c21eca3e7a28d.tar.xz UXP-e2de507e0261c9b138cd3cf5356c21eca3e7a28d.zip | |
Issue #1323 - Move XULRunner back to topsrcdir
Diffstat (limited to 'build')
| -rw-r--r-- | build/moz.configure/init.configure | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index a275957b7..713b2ce61 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) |