73 files changed, 6 insertions, 11 deletions
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/application/xulrunner/README.xulrunner b/xulrunner/README.xulrunner
index 424b7a6150..424b7a6150 100644
--- a/application/xulrunner/README.xulrunner
+++ b/xulrunner/README.xulrunner
diff --git a/application/xulrunner/app.mozbuild b/xulrunner/app.mozbuild
index 7b83160161..2902b76077 100644
--- a/application/xulrunner/app.mozbuild
+++ b/xulrunner/app.mozbuild
@@ -9,5 +9,5 @@ if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
 
 DIRS += [
-    '/application/xulrunner',
+    '/xulrunner',
 ]
diff --git a/application/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in
index 98e377d69c..98e377d69c 100644
--- a/application/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
diff --git a/application/xulrunner/app/default16.png b/xulrunner/app/default16.png
index e74f5cf2e4..e74f5cf2e4 100644
--- a/application/xulrunner/app/default16.png
+++ b/xulrunner/app/default16.png
diff --git a/application/xulrunner/app/default32.png b/xulrunner/app/default32.png
index 9145090543..9145090543 100644
--- a/application/xulrunner/app/default32.png
+++ b/xulrunner/app/default32.png
diff --git a/application/xulrunner/app/default48.png b/xulrunner/app/default48.png
index 5fd71e110c..5fd71e110c 100644
--- a/application/xulrunner/app/default48.png
+++ b/xulrunner/app/default48.png
diff --git a/application/xulrunner/app/document.ico b/xulrunner/app/document.ico
index 3111163247..3111163247 100644
--- a/application/xulrunner/app/document.ico
+++ b/xulrunner/app/document.ico
diff --git a/application/xulrunner/app/install_app.py b/xulrunner/app/install_app.py
index 6be8c5ecb5..6be8c5ecb5 100644
--- a/application/xulrunner/app/install_app.py
+++ b/xulrunner/app/install_app.py
diff --git a/application/xulrunner/app/macbuild/Info.plist.in b/xulrunner/app/macbuild/Info.plist.in
index 69676b80c5..69676b80c5 100644
--- a/application/xulrunner/app/macbuild/Info.plist.in
+++ b/xulrunner/app/macbuild/Info.plist.in
diff --git a/application/xulrunner/app/macbuild/InfoPlist.strings b/xulrunner/app/macbuild/InfoPlist.strings
index 5d9eefd515..5d9eefd515 100644
--- a/application/xulrunner/app/macbuild/InfoPlist.strings
+++ b/xulrunner/app/macbuild/InfoPlist.strings
diff --git a/application/xulrunner/app/moz.build b/xulrunner/app/moz.build
index 1c9cb117cf..1c9cb117cf 100644
--- a/application/xulrunner/app/moz.build
+++ b/xulrunner/app/moz.build
diff --git a/application/xulrunner/app/nsXULRunnerApp.cpp b/xulrunner/app/nsXULRunnerApp.cpp
index d86317a856..d86317a856 100644
--- a/application/xulrunner/app/nsXULRunnerApp.cpp
+++ b/xulrunner/app/nsXULRunnerApp.cpp
diff --git a/application/xulrunner/app/splash.rc b/xulrunner/app/splash.rc
index 4374383ba5..4374383ba5 100644
--- a/application/xulrunner/app/splash.rc
+++ b/xulrunner/app/splash.rc
diff --git a/application/xulrunner/app/xulrunner.exe.manifest b/xulrunner/app/xulrunner.exe.manifest
index b08eea0745..b08eea0745 100644
--- a/application/xulrunner/app/xulrunner.exe.manifest
+++ b/xulrunner/app/xulrunner.exe.manifest
diff --git a/application/xulrunner/app/xulrunner.ico b/xulrunner/app/xulrunner.ico
index 0518438a04..0518438a04 100644
--- a/application/xulrunner/app/xulrunner.ico
+++ b/xulrunner/app/xulrunner.ico
diff --git a/application/xulrunner/app/xulrunner.js b/xulrunner/app/xulrunner.js
index 509bb48a50..509bb48a50 100644
--- a/application/xulrunner/app/xulrunner.js
+++ b/xulrunner/app/xulrunner.js
diff --git a/application/xulrunner/config/mozconfig b/xulrunner/config/mozconfig
index 9fa972cac7..9fa972cac7 100644
--- a/application/xulrunner/config/mozconfig
+++ b/xulrunner/config/mozconfig
diff --git a/application/xulrunner/config/mozconfigs/common b/xulrunner/config/mozconfigs/common
index a6811c575c..a6811c575c 100644
--- a/application/xulrunner/config/mozconfigs/common
+++ b/xulrunner/config/mozconfigs/common
diff --git a/application/xulrunner/config/mozconfigs/common.override b/xulrunner/config/mozconfigs/common.override
index 8d719a5b5e..8d719a5b5e 100644
--- a/application/xulrunner/config/mozconfigs/common.override
+++ b/xulrunner/config/mozconfigs/common.override
diff --git a/application/xulrunner/config/mozconfigs/linux32/xulrunner b/xulrunner/config/mozconfigs/linux32/xulrunner
index 171674f8c8..171674f8c8 100644
--- a/application/xulrunner/config/mozconfigs/linux32/xulrunner
+++ b/xulrunner/config/mozconfigs/linux32/xulrunner
diff --git a/application/xulrunner/config/mozconfigs/linux32/xulrunner-qt b/xulrunner/config/mozconfigs/linux32/xulrunner-qt
index 54e4ecb8f5..54e4ecb8f5 100644
--- a/application/xulrunner/config/mozconfigs/linux32/xulrunner-qt
+++ b/xulrunner/config/mozconfigs/linux32/xulrunner-qt
diff --git a/application/xulrunner/config/mozconfigs/linux64/xulrunner b/xulrunner/config/mozconfigs/linux64/xulrunner
index c18a12f679..c18a12f679 100644
--- a/application/xulrunner/config/mozconfigs/linux64/xulrunner
+++ b/xulrunner/config/mozconfigs/linux64/xulrunner
diff --git a/application/xulrunner/config/mozconfigs/macosx-universal/xulrunner b/xulrunner/config/mozconfigs/macosx-universal/xulrunner
index ac7e24fe23..ac7e24fe23 100644
--- a/application/xulrunner/config/mozconfigs/macosx-universal/xulrunner
+++ b/xulrunner/config/mozconfigs/macosx-universal/xulrunner
diff --git a/application/xulrunner/config/mozconfigs/win32/xulrunner b/xulrunner/config/mozconfigs/win32/xulrunner
index 4c8b596a56..4c8b596a56 100644
--- a/application/xulrunner/config/mozconfigs/win32/xulrunner
+++ b/xulrunner/config/mozconfigs/win32/xulrunner
diff --git a/application/xulrunner/config/mozconfigs/win64/xulrunner b/xulrunner/config/mozconfigs/win64/xulrunner
index 7dbade2bb0..7dbade2bb0 100644
--- a/application/xulrunner/config/mozconfigs/win64/xulrunner
+++ b/xulrunner/config/mozconfigs/win64/xulrunner
diff --git a/application/xulrunner/configure.in b/xulrunner/configure.in
index 825faaddd1..825faaddd1 100644
--- a/application/xulrunner/configure.in
+++ b/xulrunner/configure.in
diff --git a/application/xulrunner/confvars.sh b/xulrunner/confvars.sh
index 794b2b4b12..794b2b4b12 100644
--- a/application/xulrunner/confvars.sh
+++ b/xulrunner/confvars.sh
diff --git a/application/xulrunner/examples/moz.build b/xulrunner/examples/moz.build
index a1782b42fe..a1782b42fe 100644
--- a/application/xulrunner/examples/moz.build
+++ b/xulrunner/examples/moz.build
diff --git a/application/xulrunner/examples/simple/application.ini b/xulrunner/examples/simple/application.ini
index 39c051422a..39c051422a 100644
--- a/application/xulrunner/examples/simple/application.ini
+++ b/xulrunner/examples/simple/application.ini
diff --git a/application/xulrunner/examples/simple/components/moz.build b/xulrunner/examples/simple/components/moz.build
index 8ff4685344..8ff4685344 100644
--- a/application/xulrunner/examples/simple/components/moz.build
+++ b/xulrunner/examples/simple/components/moz.build
diff --git a/application/xulrunner/examples/simple/components/public/moz.build b/xulrunner/examples/simple/components/public/moz.build
index 3a611f85ac..3a611f85ac 100644
--- a/application/xulrunner/examples/simple/components/public/moz.build
+++ b/xulrunner/examples/simple/components/public/moz.build
diff --git a/application/xulrunner/examples/simple/components/public/nsISimpleTest.idl b/xulrunner/examples/simple/components/public/nsISimpleTest.idl
index 99b9b86af2..99b9b86af2 100644
--- a/application/xulrunner/examples/simple/components/public/nsISimpleTest.idl
+++ b/xulrunner/examples/simple/components/public/nsISimpleTest.idl
diff --git a/application/xulrunner/examples/simple/components/src/SimpleTest.cpp b/xulrunner/examples/simple/components/src/SimpleTest.cpp
index 06249abddb..06249abddb 100644
--- a/application/xulrunner/examples/simple/components/src/SimpleTest.cpp
+++ b/xulrunner/examples/simple/components/src/SimpleTest.cpp
diff --git a/application/xulrunner/examples/simple/components/src/SimpleTest.js b/xulrunner/examples/simple/components/src/SimpleTest.js
index e6cf90660c..e6cf90660c 100644
--- a/application/xulrunner/examples/simple/components/src/SimpleTest.js
+++ b/xulrunner/examples/simple/components/src/SimpleTest.js
diff --git a/application/xulrunner/examples/simple/components/src/SimpleTest.manifest b/xulrunner/examples/simple/components/src/SimpleTest.manifest
index c7388b9d72..c7388b9d72 100644
--- a/application/xulrunner/examples/simple/components/src/SimpleTest.manifest
+++ b/xulrunner/examples/simple/components/src/SimpleTest.manifest
diff --git a/application/xulrunner/examples/simple/components/src/moz.build b/xulrunner/examples/simple/components/src/moz.build
index 153bfdd0cf..153bfdd0cf 100644
--- a/application/xulrunner/examples/simple/components/src/moz.build
+++ b/xulrunner/examples/simple/components/src/moz.build
diff --git a/application/xulrunner/examples/simple/content/contents.rdf b/xulrunner/examples/simple/content/contents.rdf
index e69de29bb2..e69de29bb2 100644
--- a/application/xulrunner/examples/simple/content/contents.rdf
+++ b/xulrunner/examples/simple/content/contents.rdf
diff --git a/application/xulrunner/examples/simple/content/simple.js b/xulrunner/examples/simple/content/simple.js
index acf6f1029d..acf6f1029d 100644
--- a/application/xulrunner/examples/simple/content/simple.js
+++ b/xulrunner/examples/simple/content/simple.js
diff --git a/application/xulrunner/examples/simple/content/simple.xul b/xulrunner/examples/simple/content/simple.xul
index 6ff915d0ce..6ff915d0ce 100644
--- a/application/xulrunner/examples/simple/content/simple.xul
+++ b/xulrunner/examples/simple/content/simple.xul
diff --git a/application/xulrunner/examples/simple/icons/simple.ico b/xulrunner/examples/simple/icons/simple.ico
index 16bd7e9d1c..16bd7e9d1c 100644
--- a/application/xulrunner/examples/simple/icons/simple.ico
+++ b/xulrunner/examples/simple/icons/simple.ico
diff --git a/application/xulrunner/examples/simple/jar.mn b/xulrunner/examples/simple/jar.mn
index 7d141ad1d6..7d141ad1d6 100644
--- a/application/xulrunner/examples/simple/jar.mn
+++ b/xulrunner/examples/simple/jar.mn
diff --git a/application/xulrunner/examples/simple/locale/simple.dtd b/xulrunner/examples/simple/locale/simple.dtd
index 2fd1c9285c..2fd1c9285c 100644
--- a/application/xulrunner/examples/simple/locale/simple.dtd
+++ b/xulrunner/examples/simple/locale/simple.dtd
diff --git a/application/xulrunner/examples/simple/moz.build b/xulrunner/examples/simple/moz.build
index c88c57a4b8..c88c57a4b8 100644
--- a/application/xulrunner/examples/simple/moz.build
+++ b/xulrunner/examples/simple/moz.build
diff --git a/application/xulrunner/examples/simple/simple-prefs.js b/xulrunner/examples/simple/simple-prefs.js
index fc92e0df5f..fc92e0df5f 100644
--- a/application/xulrunner/examples/simple/simple-prefs.js
+++ b/xulrunner/examples/simple/simple-prefs.js
diff --git a/application/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in
index 04803dddbe..04803dddbe 100644
--- a/application/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
diff --git a/application/xulrunner/installer/debian/changelog.in b/xulrunner/installer/debian/changelog.in
index 1efd55a1db..1efd55a1db 100644
--- a/application/xulrunner/installer/debian/changelog.in
+++ b/xulrunner/installer/debian/changelog.in
diff --git a/application/xulrunner/installer/debian/compat b/xulrunner/installer/debian/compat
index b8626c4cff..b8626c4cff 100644
--- a/application/xulrunner/installer/debian/compat
+++ b/xulrunner/installer/debian/compat
diff --git a/application/xulrunner/installer/debian/control b/xulrunner/installer/debian/control
index da99aa8d40..da99aa8d40 100644
--- a/application/xulrunner/installer/debian/control
+++ b/xulrunner/installer/debian/control
diff --git a/application/xulrunner/installer/debian/icon_base64 b/xulrunner/installer/debian/icon_base64
index 124fb4cccb..124fb4cccb 100644
--- a/application/xulrunner/installer/debian/icon_base64
+++ b/xulrunner/installer/debian/icon_base64
diff --git a/application/xulrunner/installer/debian/menu b/xulrunner/installer/debian/menu
index e1ce52201c..e1ce52201c 100644
--- a/application/xulrunner/installer/debian/menu
+++ b/xulrunner/installer/debian/menu
diff --git a/application/xulrunner/installer/debian/postinst.in b/xulrunner/installer/debian/postinst.in
index 0f06640e29..0f06640e29 100644
--- a/application/xulrunner/installer/debian/postinst.in
+++ b/xulrunner/installer/debian/postinst.in
diff --git a/application/xulrunner/installer/debian/prerm.in b/xulrunner/installer/debian/prerm.in
index 1d46d382c3..1d46d382c3 100644
--- a/application/xulrunner/installer/debian/prerm.in
+++ b/xulrunner/installer/debian/prerm.in
diff --git a/application/xulrunner/installer/debian/xulrunner.links.in b/xulrunner/installer/debian/xulrunner.links.in
index eabac6f51d..eabac6f51d 100644
--- a/application/xulrunner/installer/debian/xulrunner.links.in
+++ b/xulrunner/installer/debian/xulrunner.links.in
diff --git a/application/xulrunner/installer/debian/xulrunner.service.in b/xulrunner/installer/debian/xulrunner.service.in
index 48d87a1b92..48d87a1b92 100644
--- a/application/xulrunner/installer/debian/xulrunner.service.in
+++ b/xulrunner/installer/debian/xulrunner.service.in
diff --git a/application/xulrunner/installer/libxul-embedding.pc.in b/xulrunner/installer/libxul-embedding.pc.in
index 100e0a763d..100e0a763d 100644
--- a/application/xulrunner/installer/libxul-embedding.pc.in
+++ b/xulrunner/installer/libxul-embedding.pc.in
diff --git a/application/xulrunner/installer/libxul.pc.in b/xulrunner/installer/libxul.pc.in
index ccce9aa592..ccce9aa592 100644
--- a/application/xulrunner/installer/libxul.pc.in
+++ b/xulrunner/installer/libxul.pc.in
diff --git a/application/xulrunner/installer/moz.build b/xulrunner/installer/moz.build
index 895d11993c..895d11993c 100644
--- a/application/xulrunner/installer/moz.build
+++ b/xulrunner/installer/moz.build
diff --git a/application/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in
index 55e84ca003..55e84ca003 100644
--- a/application/xulrunner/installer/mozilla-js.pc.in
+++ b/xulrunner/installer/mozilla-js.pc.in
diff --git a/application/xulrunner/installer/mozilla-nspr.pc.in b/xulrunner/installer/mozilla-nspr.pc.in
index 7ebd3421c9..7ebd3421c9 100644
--- a/application/xulrunner/installer/mozilla-nspr.pc.in
+++ b/xulrunner/installer/mozilla-nspr.pc.in
diff --git a/application/xulrunner/installer/mozilla-nss.pc.in b/xulrunner/installer/mozilla-nss.pc.in
index 90f14c3ae5..90f14c3ae5 100644
--- a/application/xulrunner/installer/mozilla-nss.pc.in
+++ b/xulrunner/installer/mozilla-nss.pc.in
diff --git a/application/xulrunner/installer/mozilla-plugin.pc.in b/xulrunner/installer/mozilla-plugin.pc.in
index 7080161b3f..7080161b3f 100644
--- a/application/xulrunner/installer/mozilla-plugin.pc.in
+++ b/xulrunner/installer/mozilla-plugin.pc.in
diff --git a/application/xulrunner/locales/all-locales b/xulrunner/locales/all-locales
index 85ef789a67..85ef789a67 100644
--- a/application/xulrunner/locales/all-locales
+++ b/xulrunner/locales/all-locales
diff --git a/application/xulrunner/moz.build b/xulrunner/moz.build
index 371f69f5e1..371f69f5e1 100644
--- a/application/xulrunner/moz.build
+++ b/xulrunner/moz.build
diff --git a/application/xulrunner/moz.configure b/xulrunner/moz.configure
index 72236254f1..d5e7dba11a 100644
--- a/application/xulrunner/moz.configure
+++ b/xulrunner/moz.configure
@@ -4,4 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('../../toolkit/moz.configure')
+include('../toolkit/moz.configure')
diff --git a/application/xulrunner/stub/Makefile.in b/xulrunner/stub/Makefile.in
index 0fa0cccf61..0fa0cccf61 100644
--- a/application/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
diff --git a/application/xulrunner/stub/moz.build b/xulrunner/stub/moz.build
index 4fd172f72f..4fd172f72f 100644
--- a/application/xulrunner/stub/moz.build
+++ b/xulrunner/stub/moz.build
diff --git a/application/xulrunner/stub/nsXULStub.cpp b/xulrunner/stub/nsXULStub.cpp
index 8638ae43e1..8638ae43e1 100644
--- a/application/xulrunner/stub/nsXULStub.cpp
+++ b/xulrunner/stub/nsXULStub.cpp
diff --git a/application/xulrunner/stub/xulrunner-stub.exe.manifest b/xulrunner/stub/xulrunner-stub.exe.manifest
index 57c2a70708..57c2a70708 100644
--- a/application/xulrunner/stub/xulrunner-stub.exe.manifest
+++ b/xulrunner/stub/xulrunner-stub.exe.manifest
diff --git a/application/xulrunner/stub/xulrunner-stub.rc b/xulrunner/stub/xulrunner-stub.rc
index 84c3e47ed0..84c3e47ed0 100644
--- a/application/xulrunner/stub/xulrunner-stub.rc
+++ b/xulrunner/stub/xulrunner-stub.rc
diff --git a/application/xulrunner/tools/redit/Makefile.in b/xulrunner/tools/redit/Makefile.in
index 31c253be80..31c253be80 100644
--- a/application/xulrunner/tools/redit/Makefile.in
+++ b/xulrunner/tools/redit/Makefile.in
diff --git a/application/xulrunner/tools/redit/moz.build b/xulrunner/tools/redit/moz.build
index 812a56578e..812a56578e 100644
--- a/application/xulrunner/tools/redit/moz.build
+++ b/xulrunner/tools/redit/moz.build
diff --git a/application/xulrunner/tools/redit/redit.cpp b/xulrunner/tools/redit/redit.cpp
index 8a96358b22..8a96358b22 100644
--- a/application/xulrunner/tools/redit/redit.cpp
+++ b/xulrunner/tools/redit/redit.cpp