diff options
25 files changed, 67 insertions, 34 deletions
diff --git a/browser/configure.in b/browser/configure.in new file mode 100644 index 000000000..fe3e5acf1 --- /dev/null +++ b/browser/configure.in @@ -0,0 +1,15 @@ +dnl -*- Mode: Autoconf; tab-width: 2; indent-tabs-mode: nil; -*- +dnl vi: set tabstop=2 shiftwidth=2 expandtab: +dnl This Source Code Form is subject to the terms of the Mozilla Public +dnl License, v. 2.0. If a copy of the MPL was not distributed with this +dnl file, You can obtain one at http://mozilla.org/MPL/2.0/. + +dnl Things we need to carry from confvars.sh +AC_DEFINE(MOZ_PHOENIX) +AC_SUBST(MOZ_PHOENIX) + +AC_DEFINE(MC_BASILISK) +AC_SUBST(MC_BASILISK) + +dnl Optional parts of the build. + diff --git a/browser/confvars.sh b/browser/confvars.sh index 1bc9d1ad0..98fa4cbe9 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -5,8 +5,9 @@ MOZ_APP_BASENAME=Firefox MOZ_APP_VENDOR=Mozilla -MOZ_UPDATER=1 MOZ_PHOENIX=1 +MC_BASILISK=1 +MOZ_UPDATER=1 if test "$OS_ARCH" = "WINNT" -o \ "$OS_ARCH" = "Linux"; then diff --git a/build/moz.build b/build/moz.build index 345ba9be0..7b414ce12 100644 --- a/build/moz.build +++ b/build/moz.build @@ -26,7 +26,7 @@ for var in ('GRE_MILESTONE', 'MOZ_APP_VERSION', 'MOZ_APP_BASENAME', if CONFIG['MOZ_APP_DISPLAYNAME'] != CONFIG['MOZ_APP_BASENAME']: DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME'] -if CONFIG['MOZ_BUILD_APP'] == 'browser': +if CONFIG['MOZ_PHOENIX']: DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True if CONFIG['MOZ_APP_PROFILE']: @@ -37,7 +37,7 @@ for var in ('MOZ_CRASHREPORTER', 'MOZ_PROFILE_MIGRATOR', if CONFIG[var]: DEFINES[var] = True -if CONFIG['MOZ_BUILD_APP'] == 'browser': +if CONFIG['MOZ_PHOENIX']: PYTHON_UNIT_TESTS += [ 'compare-mozconfig/compare-mozconfigs-wrapper.py', ] diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 2123bebc9..5f7e9b3ee 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -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): diff --git a/devtools/client/moz.build b/devtools/client/moz.build index b63de757c..b55aa5380 100644 --- a/devtools/client/moz.build +++ b/devtools/client/moz.build @@ -38,7 +38,7 @@ DIRS += [ ] # Shim old theme paths used by DevTools add-ons -if CONFIG['MOZ_BUILD_APP'] == 'browser': +if CONFIG['MOZ_PHOENIX']: DIRS += ['themes/shims'] EXTRA_COMPONENTS += [ diff --git a/devtools/moz.build b/devtools/moz.build index b11c4a510..79787d019 100644 --- a/devtools/moz.build +++ b/devtools/moz.build @@ -20,6 +20,6 @@ DIRS += [ # /browser uses DIST_SUBDIR. We opt-in to this treatment when building # DevTools for the browser to keep the root omni.ja slim for use by external XUL # apps. Mulet also uses this since it includes /browser. -if CONFIG['MOZ_BUILD_APP'] in ('browser', 'b2g/dev'): +if CONFIG['MOZ_BUILD_APP'] == 'b2g/dev' or CONFIG['MOZ_PHOENIX']: DIST_SUBDIR = 'browser' export('DIST_SUBDIR') diff --git a/dom/base/moz.build b/dom/base/moz.build index d237acb03..0bc9902e4 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -472,7 +472,7 @@ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' -if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: +if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']: DEFINES['HAVE_SIDEBAR'] = True if CONFIG['MOZ_X11']: diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index fadaac69b..eb00482c6 100644 --- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -139,7 +139,7 @@ FINAL_LIBRARY = 'xul' SPHINX_TREES['webidl'] = 'docs' SPHINX_PYTHON_PACKAGE_DIRS += ['mozwebidlcodegen'] -if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: +if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or 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 efa90230d..0b415d448 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -764,12 +764,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': 'MozWifiStatusChangeEvent.webidl', ] -if CONFIG['MOZ_BUILD_APP'] in ['browser', 'xulrunner'] or CONFIG['MOZ_SUITE']: +if CONFIG['MOZ_BUILD_APP'] in ['xulrunner'] or CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_SUITE']: WEBIDL_FILES += [ 'BrowserFeedWriter.webidl', ] -if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: +if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']: WEBIDL_FILES += [ 'External.webidl', ] diff --git a/old-configure.in b/old-configure.in index 2de3e9db8..4fffb721f 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2401,10 +2401,6 @@ fi # that haven't made a confvars.sh yet. Don't add new stuff here, use # MOZ_BUILD_APP. case "$MOZ_BUILD_APP" in -browser) - AC_DEFINE(MOZ_PHOENIX) - ;; - xulrunner) AC_DEFINE(MOZ_XULRUNNER) ;; @@ -2433,7 +2429,6 @@ if test -n "$MOZ_RUST"; then fi fi -AC_SUBST(MOZ_PHOENIX) AC_SUBST(MOZ_XULRUNNER) AC_SUBST(MOZ_B2G) AC_SUBST(MOZ_MULET) diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py index a50b8ff89..9ca689009 100644 --- a/python/mozbuild/mozbuild/base.py +++ b/python/mozbuild/mozbuild/base.py @@ -740,7 +740,7 @@ class MachCommandConditions(object): def is_firefox(cls): """Must have a Firefox build.""" if hasattr(cls, 'substs'): - return cls.substs.get('MOZ_BUILD_APP') == 'browser' + return cls.substs.get('MOZ_PHOENIX') == 1 return False @staticmethod diff --git a/testing/gtest/Makefile.in b/testing/gtest/Makefile.in index d2978b5b9..2fb29eb47 100644 --- a/testing/gtest/Makefile.in +++ b/testing/gtest/Makefile.in @@ -7,7 +7,7 @@ include $(topsrcdir)/config/rules.mk -ifeq (browser,$(MOZ_BUILD_APP)) +ifdef MOZ_PHOENIX ifdef COMPILE_ENVIRONMENT gtest:: $(MAKE) -C $(DEPTH)/toolkit/library gtestxul diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk index c16bd9d8d..8b1d7d50d 100644 --- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -22,7 +22,7 @@ ifdef MOZ_B2G BUILD_GTEST= endif -ifneq (browser,$(MOZ_BUILD_APP)) +ifndef MOZ_PHOENIX BUILD_GTEST= endif diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build index 72c8c70a4..e54e6ba2d 100644 --- a/toolkit/components/passwordmgr/moz.build +++ b/toolkit/components/passwordmgr/moz.build @@ -4,7 +4,7 @@ # 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/. -if CONFIG['MOZ_BUILD_APP'] == 'browser': +if CONFIG['MOZ_PHOENIX']: DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True MOCHITEST_MANIFESTS += ['test/mochitest.ini', 'test/mochitest/mochitest.ini'] @@ -67,7 +67,7 @@ if CONFIG['OS_TARGET'] == 'WINNT': 'OSCrypto_win.js', ] -if CONFIG['MOZ_BUILD_APP'] == 'browser': +if CONFIG['MOZ_PHOENIX']: EXTRA_JS_MODULES += [ 'LoginManagerContextMenu.jsm', ] diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build index 98ccf2b8d..2dc142882 100644 --- a/toolkit/components/search/moz.build +++ b/toolkit/components/search/moz.build @@ -11,7 +11,7 @@ EXTRA_COMPONENTS += [ 'nsSearchSuggestions.js', ] -if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
+if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']:
DEFINES['HAVE_SIDEBAR'] = True
EXTRA_COMPONENTS += [ 'nsSidebar.js', diff --git a/toolkit/components/telemetry/TelemetryEnvironment.jsm b/toolkit/components/telemetry/TelemetryEnvironment.jsm index e2453649c..2f4ac81ba 100644 --- a/toolkit/components/telemetry/TelemetryEnvironment.jsm +++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm @@ -784,7 +784,7 @@ function EnvironmentCache() { this._currentEnvironment.profile = {}; p.push(this._updateProfile()); - if (AppConstants.MOZ_BUILD_APP == "browser") { + if (AppConstants.MOZ_PHOENIX) { p.push(this._updateAttribution()); } diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index 7ce8e1f09..8d9fa103c 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -308,7 +308,14 @@ this.AppConstants = Object.freeze({ MOZ_APP_NAME: "@MOZ_APP_NAME@", MOZ_APP_VERSION: "@MOZ_APP_VERSION@", MOZ_APP_VERSION_DISPLAY: "@MOZ_APP_VERSION_DISPLAY@", - MOZ_BUILD_APP: "@MOZ_BUILD_APP@", + + MOZ_BUILD_APP: +#ifdef MOZ_PHOENIX + "browser", +#else + "@MOZ_BUILD_APP@", +#endif + MOZ_MACBUNDLE_NAME: "@MOZ_MACBUNDLE_NAME@", MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@", INSTALL_LOCALE: "@AB_CD@", diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn index 2070dd6fd..8d1c12305 100644 --- a/toolkit/themes/linux/mozapps/jar.mn +++ b/toolkit/themes/linux/mozapps/jar.mn @@ -28,7 +28,7 @@ toolkit.jar: skin/classic/mozapps/update/updates.css (update/updates.css) skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/themes/moz.build b/toolkit/themes/moz.build index 3d435ba71..4031f36b8 100644 --- a/toolkit/themes/moz.build +++ b/toolkit/themes/moz.build @@ -17,7 +17,11 @@ # mobile native UIs that do not use XUL for UI toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] -app = CONFIG['MOZ_BUILD_APP'] +if CONFIG['MOZ_PHOENIX']: + DEFINES['MOZ_PHOENIX'] = 1 + app = 'browser' +else: + app = CONFIG['MOZ_BUILD_APP'] if toolkit == 'cocoa': DIRS += ['osx'] diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn index e979d4a8c..79bb062ab 100644 --- a/toolkit/themes/osx/global/jar.mn +++ b/toolkit/themes/osx/global/jar.mn @@ -145,7 +145,7 @@ toolkit.jar: skin/classic/global/tree/folder.png (tree/folder.png) skin/classic/global/tree/folder@2x.png (tree/folder@2x.png) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn index 3b58f1e4e..3f5717073 100644 --- a/toolkit/themes/osx/mozapps/jar.mn +++ b/toolkit/themes/osx/mozapps/jar.mn @@ -51,7 +51,7 @@ toolkit.jar: skin/classic/mozapps/xpinstall/xpinstallConfirm.css (extensions/xpinstallConfirm.css) skin/classic/mozapps/handling/handling.css (handling/handling.css) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn index 151749f72..859f1ba4a 100644 --- a/toolkit/themes/shared/non-mac.jar.inc.mn +++ b/toolkit/themes/shared/non-mac.jar.inc.mn @@ -123,7 +123,7 @@ skin/classic/mozapps/update/downloadButtons.png (../../windows/mozapps/update/downloadButtons.png) * skin/classic/mozapps/xpinstall/xpinstallConfirm.css (../../windows/mozapps/extensions/xpinstallConfirm.css) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn index 48613e794..7f0771020 100644 --- a/toolkit/themes/windows/global/jar.mn +++ b/toolkit/themes/windows/global/jar.mn @@ -90,7 +90,7 @@ toolkit.jar: skin/classic/global/tree/twisty-XP.svg (tree/twisty-XP.svg) skin/classic/global/tree/twisty-Vista78.svg (tree/twisty-Vista78.svg) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn index 9cf4acda3..901e93e4e 100644 --- a/toolkit/themes/windows/mozapps/jar.mn +++ b/toolkit/themes/windows/mozapps/jar.mn @@ -43,7 +43,7 @@ toolkit.jar: skin/classic/mozapps/profile/profileicon-XP.png (profile/profileicon-XP.png) skin/classic/mozapps/update/downloadButtons-XP.png (update/downloadButtons-XP.png) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index dd15dc0bd..7ada19d41 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -136,7 +136,7 @@ DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE'] for var in ('APP_VERSION', 'APP_ID'): DEFINES[var] = CONFIG['MOZ_%s' % var] -if CONFIG['MOZ_BUILD_APP'] == 'browser': +if CONFIG['MOZ_PHOENIX']: DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True LOCAL_INCLUDES += [ |