Bug 1490575 - Remove MOZ_MULET checks from build files. r=froydnj
authorChris Peterson <cpeterson@mozilla.com>
Tue, 11 Sep 2018 23:16:36 -0700
changeset 494766 bbff7e9a84aac188e9cdabb1ec5b36150d1e5408
parent 494765 42281d374a870482752c1349c373b658af89beba
child 494767 bcccbd9b25a17d424c3cc5c19b783ee20198df20
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1490575
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1490575 - Remove MOZ_MULET checks from build files. r=froydnj Mulet was a Firefox OS simulator that is no longer supported: https://wiki.mozilla.org/Mulet Differential Revision: https://phabricator.services.mozilla.com/D5734
browser/installer/Makefile.in
old-configure.in
python/mozbuild/mozbuild/mozinfo.py
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -11,21 +11,17 @@ MOZ_PKG_REMOVALS = $(srcdir)/removed-fil
 
 MOZ_PKG_MANIFEST = $(srcdir)/package-manifest.in
 MOZ_PKG_DUPEFLAGS = -f $(srcdir)/allowed-dupes.mn
 
 DEFINES += -DPKG_LOCALE_MANIFEST=$(topobjdir)/browser/installer/locale-manifest.in
 MOZ_CHROME_LOCALE_ENTRIES=@RESPATH@/browser/chrome/ @RESPATH@/chrome/
 
 # Some files have been already bundled with xulrunner
-ifndef MOZ_MULET
 MOZ_PKG_FATAL_WARNINGS = 1
-else
-DEFINES += -DMOZ_MULET
-endif
 
 # When packaging an artifact build not all xpt files expected by the
 # packager will be present.
 ifdef MOZ_ARTIFACT_BUILDS
 MOZ_PKG_FATAL_WARNINGS =
 endif
 
 DEFINES += -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
--- a/old-configure.in
+++ b/old-configure.in
@@ -2035,23 +2035,18 @@ xulrunner)
   ;;
 esac
 
 # Graphene is a desktop runtime for running applications with a HTML UI.
 if test -n "$MOZ_GRAPHENE"; then
     AC_DEFINE(MOZ_GRAPHENE)
 fi
 
-if test -n "$MOZ_MULET"; then
-    AC_DEFINE(MOZ_MULET)
-fi
-
 AC_SUBST(MOZ_PHOENIX)
 AC_SUBST(MOZ_XULRUNNER)
-AC_SUBST(MOZ_MULET)
 
 dnl ========================================================
 dnl Ensure Android SDK and build-tools versions depending on
 dnl mobile target.
 dnl ========================================================
 
 case "$MOZ_BUILD_APP" in
 mobile/android)
--- a/python/mozbuild/mozbuild/mozinfo.py
+++ b/python/mozbuild/mozbuild/mozinfo.py
@@ -47,19 +47,17 @@ def build_dict(config, env=os.environ):
     # Widget toolkit, just pass the value directly through.
     d["toolkit"] = substs.get("MOZ_WIDGET_TOOLKIT")
 
     # Application name
     if 'MOZ_APP_NAME' in substs:
         d["appname"] = substs["MOZ_APP_NAME"]
 
     # Build app name
-    if 'MOZ_MULET' in substs and substs.get('MOZ_MULET') == "1":
-        d["buildapp"] = "mulet"
-    elif 'MOZ_BUILD_APP' in substs:
+    if 'MOZ_BUILD_APP' in substs:
         d["buildapp"] = substs["MOZ_BUILD_APP"]
 
     # processor
     p = substs["TARGET_CPU"]
     # do some slight massaging for some values
     #TODO: retain specific values in case someone wants them?
     if p.startswith("arm"):
         p = "arm"
@@ -95,28 +93,25 @@ def build_dict(config, env=os.environ):
     d['allow_legacy_extensions'] = substs.get('MOZ_ALLOW_LEGACY_EXTENSIONS') == '1'
     d['official'] = bool(substs.get('MOZILLA_OFFICIAL'))
     d['updater'] = substs.get('MOZ_UPDATER') == '1'
     d['artifact'] = substs.get('MOZ_ARTIFACT_BUILDS') == '1'
     d['ccov'] = substs.get('MOZ_CODE_COVERAGE') == '1'
     d['cc_type'] = substs.get('CC_TYPE')
 
     def guess_platform():
-        if d['buildapp'] in ('browser', 'mulet'):
+        if d['buildapp'] == 'browser':
             p = d['os']
             if p == 'mac':
                 p = 'macosx64'
             elif d['bits'] == 64:
                 p = '{}64'.format(p)
             elif p in ('win',):
                 p = '{}32'.format(p)
 
-            if d['buildapp'] == 'mulet':
-                p = '{}-mulet'.format(p)
-
             if d['asan']:
                 p = '{}-asan'.format(p)
 
             return p
 
         if d['buildapp'] == 'mobile/android':
             if d['processor'] == 'x86':
                 return 'android-x86'