diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/mozbuild/mozbuild/base.py | 2 | ||||
| -rw-r--r-- | python/mozbuild/mozbuild/mach_commands.py | 18 | ||||
| -rw-r--r-- | python/mozbuild/mozbuild/milestone.py | 12 | ||||
| -rw-r--r-- | python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py | 2 |
4 files changed, 29 insertions, 5 deletions
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/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py index b6802a47c..ae71d0868 100644 --- a/python/mozbuild/mozbuild/mach_commands.py +++ b/python/mozbuild/mozbuild/mach_commands.py @@ -1076,6 +1076,24 @@ class Package(MachCommandBase): return ret @CommandProvider +class Installer(MachCommandBase): + """Create the windows installer for the built product.""" + + @Command('installer', category='post-build', + description='Create the installer for the built product for distribution.') + def installer(self): + return self._run_make(directory=".", target='installer', ensure_exit_code=False) + +@CommandProvider +class Mar(MachCommandBase): + """Create the mar file for the built product.""" + + @Command('mar', category='post-build', + description='Create the mar file for the built product for distribution.') + def mar(self): + return self._run_make(directory="./tools/update-packaging/", target='', ensure_exit_code=False) + +@CommandProvider class Install(MachCommandBase): """Install a package.""" diff --git a/python/mozbuild/mozbuild/milestone.py b/python/mozbuild/mozbuild/milestone.py index c2aa78fcd..3ef55d540 100644 --- a/python/mozbuild/mozbuild/milestone.py +++ b/python/mozbuild/mozbuild/milestone.py @@ -43,6 +43,12 @@ def get_milestone_major(milestone): return milestone.split('.')[0] +def get_milestone_minor(milestone): + """ + Returns the minor (second) part of the milestone. + """ + + return milestone.split('.')[1] def main(args): parser = argparse.ArgumentParser() @@ -56,9 +62,9 @@ def main(args): milestone = get_official_milestone(milestone_file) if options.uaversion: - # Only expose the major milestone in the UA string, hide the patch - # level (bugs 572659 and 870868). - uaversion = "%s.0" % (get_milestone_major(milestone),) + # Only expose the major+minor milestone in the UA string. + uaversion = "%s.%s" % (get_milestone_major(milestone), + get_milestone_minor(milestone)) print(uaversion) elif options.symbolversion: diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py index 2ef93792b..c58fde86e 100644 --- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py @@ -313,7 +313,7 @@ class LinuxToolchainTest(BaseToolchainTest): '/usr/bin/clang-3.3': CLANG_3_3 + CLANG_PLATFORM_X86_64_LINUX, '/usr/bin/clang++-3.3': CLANGXX_3_3 + CLANG_PLATFORM_X86_64_LINUX, } - GCC_4_7_RESULT = ('Only GCC 4.8 or newer is supported ' + GCC_4_7_RESULT = ('Only GCC 4.9 or newer is supported ' '(found version 4.7.3).') GXX_4_7_RESULT = GCC_4_7_RESULT GCC_4_9_RESULT = CompilerResult( |