diff options
Diffstat (limited to 'toolkit/mozapps/installer')
| -rw-r--r-- | toolkit/mozapps/installer/package-name.mk | 12 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/packager.py | 3 |
2 files changed, 12 insertions, 3 deletions
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index d88975f36..1a8728088 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -12,10 +12,18 @@ ifndef PACKAGE_NAME_MK_INCLUDED PACKAGE_NAME_MK_INCLUDED := 1 ifndef MOZ_PKG_VERSION +# Normally MOZ_PKG_VERSION is set to the application version +MOZ_PKG_VERSION = $(MOZ_APP_VERSION) + +# This overrides it with the BUILDID for Basilisk and IceWeasel +# We do it this way because makefile's conditional checking is very +# primitive or else very cryptic ifdef MC_BASILISK MOZ_PKG_VERSION = $(BUILDID) -else -MOZ_PKG_VERSION = $(MOZ_APP_VERSION) +endif + +ifdef HYPE_ICEWEASEL +MOZ_PKG_VERSION = $(BUILDID) endif endif diff --git a/toolkit/mozapps/installer/packager.py b/toolkit/mozapps/installer/packager.py index f2dc3fac6..1a144823c 100644 --- a/toolkit/mozapps/installer/packager.py +++ b/toolkit/mozapps/installer/packager.py @@ -391,7 +391,8 @@ def main(): # Fill startup cache if isinstance(formatter, OmniJarFormatter) and launcher.can_launch() \ - and buildconfig.substs['MOZ_DISABLE_STARTUPCACHE'] != '1': + and buildconfig.substs['MOZ_DISABLE_STARTUPCACHE'] != '1' \ + and buildconfig.substs['MOZ_DISABLE_PRECOMPILED_STARTUPCACHE'] != '1': gre_path = None def get_bases(): for b in sink.packager.get_bases(addons=False): |