summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/moz.configure/init.configure6
-rw-r--r--devtools/shared/system.js3
-rwxr-xr-xdom/base/moz.build2
-rw-r--r--dom/bindings/moz.build2
-rw-r--r--dom/webidl/moz.build4
-rw-r--r--parser/html/nsIParserUtils.idl2
-rw-r--r--parser/htmlparser/nsIParser.h4
-rw-r--r--python/mozbuild/mozbuild/base.py8
-rw-r--r--toolkit/mozapps/extensions/internal/XPIProvider.jsm2
-rw-r--r--xpcom/base/nsIDebug2.idl3
-rw-r--r--xpcom/build/nsXREAppData.h2
-rw-r--r--xpcom/system/nsIXULAppInfo.idl4
12 files changed, 16 insertions, 26 deletions
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 5a1f9a8c94..8f275aee01 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -583,9 +583,7 @@ imply_option('--enable-project', application)
@depends(check_build_environment, '--help')
def default_project(build_env, help):
- if build_env.topobjdir.endswith('/js/src'):
- return 'js'
- return 'application/xulrunner'
+ return 'js'
option('--enable-project', nargs=1, default=default_project,
help='Project to build')
@@ -631,7 +629,7 @@ def build_project(project, external_source_dir, build_env, help):
build_app = project[0]
- if not external_source_dir and build_app not in ('xulrunner', 'js'):
+ if not external_source_dir and build_app not in ('js'):
die('Cannot find project %s', build_app)
build_app_abspath = os.path.join(base_dir, build_app)
diff --git a/devtools/shared/system.js b/devtools/shared/system.js
index ae46016e7e..75f5ae0c17 100644
--- a/devtools/shared/system.js
+++ b/devtools/shared/system.js
@@ -110,8 +110,7 @@ function* getSystemInfo() {
// The application's version, for example "0.8.0+" or "3.7a1pre".
// Typically, the version of Firefox, for example.
- // It is different than the version of Gecko or the XULRunner platform.
- // On B2G, this is the Gaia version.
+ // It is different than the version of the platform.
version,
// The application's build ID/date, for example "2004051604".
diff --git a/dom/base/moz.build b/dom/base/moz.build
index d788d15fed..d8f00e82db 100755
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -465,7 +465,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
-if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_XULRUNNER']:
+if CONFIG['MOZ_PHOENIX']:
DEFINES['HAVE_SIDEBAR'] = True
if CONFIG['MOZ_X11']:
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index 261bdf1f51..6200c3f383 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -115,7 +115,7 @@ FINAL_LIBRARY = 'xul'
SPHINX_TREES['webidl'] = 'docs'
SPHINX_PYTHON_PACKAGE_DIRS += ['mozwebidlcodegen']
-if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_XULRUNNER']:
+if CONFIG['MOZ_PHOENIX']:
# This is needed for Window.webidl
DEFINES['HAVE_SIDEBAR'] = True
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index b45a335ce3..1cefdacabb 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -725,12 +725,12 @@ if CONFIG['MOZ_GAMEPAD']:
'GamepadEvent.webidl',
]
-if CONFIG['MOZ_BUILD_APP'] in ['xulrunner'] or CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_SUITE']:
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_SUITE']:
WEBIDL_FILES += [
'BrowserFeedWriter.webidl',
]
-if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_XULRUNNER']:
+if CONFIG['MOZ_PHOENIX']:
WEBIDL_FILES += [
'External.webidl',
]
diff --git a/parser/html/nsIParserUtils.idl b/parser/html/nsIParserUtils.idl
index a982cb2de7..27306df253 100644
--- a/parser/html/nsIParserUtils.idl
+++ b/parser/html/nsIParserUtils.idl
@@ -9,7 +9,7 @@ interface nsIDOMDocumentFragment;
interface nsIURI;
/**
- * Non-Web HTML parser functionality to Firefox extensions and XULRunner apps.
+ * Non-Web HTML parser functionality to extensions and applications.
* Don't use this from within Gecko--use nsContentUtils, nsTreeSanitizer, etc.
* directly instead.
*/
diff --git a/parser/htmlparser/nsIParser.h b/parser/htmlparser/nsIParser.h
index 897b1d0d8f..4bf0b33704 100644
--- a/parser/htmlparser/nsIParser.h
+++ b/parser/htmlparser/nsIParser.h
@@ -10,7 +10,7 @@
* This GECKO-INTERNAL interface is on track to being REMOVED (or refactored
* to the point of being near-unrecognizable).
*
- * Please DO NOT #include this file in comm-central code, in your XULRunner
+ * Please DO NOT #include this file in comm-central code, in your XUL
* app or binary extensions.
*
* Please DO NOT #include this into new files even inside Gecko. It is more
@@ -61,7 +61,7 @@ enum eStreamState {eNone,eOnStart,eOnDataAvail,eOnStop};
* This GECKO-INTERNAL interface is on track to being REMOVED (or refactored
* to the point of being near-unrecognizable).
*
- * Please DO NOT #include this file in comm-central code, in your XULRunner
+ * Please DO NOT #include this file in comm-central code, in your XUL
* app or binary extensions.
*
* Please DO NOT #include this into new files even inside Gecko. It is more
diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
index 24791b6182..384a5028e8 100644
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@@ -318,13 +318,7 @@ class MozbuildObject(ProcessExecutionMixin):
if where == 'staged-package':
stem = os.path.join(stem, substs['MOZ_APP_NAME'])
- if substs['OS_ARCH'] == 'Darwin':
- if substs['MOZ_BUILD_APP'] == 'xulrunner':
- stem = os.path.join(stem, 'XUL.framework');
- else:
- stem = os.path.join(stem, substs['MOZ_MACBUNDLE_NAME'], 'Contents',
- 'MacOS')
- elif where == 'default':
+ if where == 'default':
stem = os.path.join(stem, 'bin')
leaf = None
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 453e2826e5..02275b8c49 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -7712,7 +7712,7 @@ WinRegInstallLocation.prototype = {
appVendor = "Mozilla";
#endif
- // XULRunner-based apps may intentionally not specify a vendor
+ // .xulapp-based apps may intentionally not specify a vendor
if (appVendor != "")
appVendor += "\\";
diff --git a/xpcom/base/nsIDebug2.idl b/xpcom/base/nsIDebug2.idl
index 7adac2cdf1..b2b6ccfb6a 100644
--- a/xpcom/base/nsIDebug2.idl
+++ b/xpcom/base/nsIDebug2.idl
@@ -21,8 +21,7 @@ interface nsIDebug2 : nsISupports
{
/**
* Whether XPCOM was compiled with DEBUG defined. This often
- * correlates to whether other code (e.g., Firefox, XULRunner) was
- * compiled with DEBUG defined.
+ * correlates to whether other code was compiled with DEBUG defined.
*/
readonly attribute boolean isDebugBuild;
diff --git a/xpcom/build/nsXREAppData.h b/xpcom/build/nsXREAppData.h
index 3c9f226b0a..c3aae3557a 100644
--- a/xpcom/build/nsXREAppData.h
+++ b/xpcom/build/nsXREAppData.h
@@ -29,7 +29,7 @@ struct nsXREAppData
/**
* The directory of the application to be run. May be null if the
- * xulrunner and the app are installed into the same directory.
+ * xre and the app are installed into the same directory.
*/
nsIFile* MOZ_NON_OWNING_REF directory;
diff --git a/xpcom/system/nsIXULAppInfo.idl b/xpcom/system/nsIXULAppInfo.idl
index 1ea9208a34..12a5fc6886 100644
--- a/xpcom/system/nsIXULAppInfo.idl
+++ b/xpcom/system/nsIXULAppInfo.idl
@@ -31,7 +31,7 @@ interface nsIXULAppInfo : nsIPlatformInfo
/**
* The version of the XUL application. It is different than the
- * version of the XULRunner platform. Be careful about which one you want.
+ * version of the XUL platform. Be careful about which one you want.
*
* @see nsXREAppData.version
* @returns an empty string if nsXREAppData.version is not set.
@@ -39,7 +39,7 @@ interface nsIXULAppInfo : nsIPlatformInfo
readonly attribute ACString version;
/**
- * The build ID/date of the application. For xulrunner applications,
+ * The build ID/date of the application. For -app applications,
* this will be different than the build ID of the platform. Be careful
* about which one you want.
*/
generated by cgit v1.2.3 (git 2.26.2) at 2024-09-20 02:26:07 +0000