Bug 1429019 - Remove QT support code's reference. r?sylvestre draft
authorMatthieuBaratte <dev.mbar@gmail.com>
Mon, 12 Feb 2018 22:54:22 +0100
changeset 754150 243d3488f296
parent 748271 60c7867bc2c4
push id98767
push userbmo:dev.mbar@gmail.com
push dateMon, 12 Feb 2018 22:21:11 +0000
reviewerssylvestre
bugs1429019
milestone59.0a1
Bug 1429019 - Remove QT support code's reference. r?sylvestre MozReview-Commit-ID: LwTAoYmxkTP
toolkit/mozapps/installer/upload-files.mk
--- 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
+  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
-          MOZ_PKG_FORMAT = TGZ
+        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
-endif
+    endif
+  endif
 endif # MOZ_PKG_FORMAT
 
 ifeq ($(OS_ARCH),WINNT)
 INSTALLER_DIR   = windows
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 ifndef _APPNAME