author | MatthieuBaratte <dev.mbar@gmail.com> |
Tue, 13 Mar 2018 23:09:46 +0100 | |
changeset 411522 | a7c810ae6894543223ae79f44f20b772d97004a3 |
parent 411521 | dbfef31316376758111683c6763ee85f6dbaac1b |
child 411523 | d3bbcd354714a1ae3f1c65851c8541daff46233d |
push id | 101686 |
push user | aciure@mozilla.com |
push date | Tue, 03 Apr 2018 21:59:31 +0000 |
treeherder | mozilla-inbound@8d846598d35d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 1429019 |
milestone | 61.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
|
--- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -1,34 +1,34 @@ # This Source Code Form is subject to the terms of the Mozilla Public # 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/. ifndef MOZ_PKG_FORMAT -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -MOZ_PKG_FORMAT = DMG -else -ifeq (,$(filter-out WINNT, $(OS_ARCH))) -MOZ_PKG_FORMAT = ZIP -else -ifeq (,$(filter-out SunOS, $(OS_ARCH))) - MOZ_PKG_FORMAT = BZ2 -else - ifeq (,$(filter-out gtk3, $(MOZ_WIDGET_TOOLKIT))) - MOZ_PKG_FORMAT = BZ2 - else - ifeq (android,$(MOZ_WIDGET_TOOLKIT)) - MOZ_PKG_FORMAT = APK - else - MOZ_PKG_FORMAT = TGZ - endif - endif -endif -endif -endif + ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) + MOZ_PKG_FORMAT = DMG + else + ifeq (WINNT,$(OS_ARCH)) + MOZ_PKG_FORMAT = ZIP + else + ifeq (SunOS,$(OS_ARCH)) + MOZ_PKG_FORMAT = BZ2 + else + ifeq (gtk3,$(MOZ_WIDGET_TOOLKIT)) + MOZ_PKG_FORMAT = BZ2 + else + ifeq (android,$(MOZ_WIDGET_TOOLKIT)) + MOZ_PKG_FORMAT = APK + else + MOZ_PKG_FORMAT = TGZ + endif + endif + endif + endif + endif endif # MOZ_PKG_FORMAT ifeq ($(OS_ARCH),WINNT) INSTALLER_DIR = windows endif ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) ifndef _APPNAME