Bug 1256979 - Remove MOZ_OMNIJAR from old-configure and upload-files.mk. r=glandium
authorChris Manchester <cmanchester@mozilla.com>
Thu, 14 Apr 2016 12:26:38 -0700
changeset 331158 a6a64a3cb0f35bbef181a4a54bcb54a52ce9bf57
parent 331157 fb9b550b88bf28d2eb6e6c717d91a2b70e3ba921
child 331159 557559847ec748518993c28da60ba2026a919aa6
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1256979
milestone48.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 1256979 - Remove MOZ_OMNIJAR from old-configure and upload-files.mk. r=glandium This was a transitional measure for the new packager code, it is no longer needed. MozReview-Commit-ID: Gk3ydeHrtVX
old-configure.in
toolkit/mozapps/installer/upload-files.mk
--- a/old-configure.in
+++ b/old-configure.in
@@ -6250,20 +6250,16 @@ dnl ====================================
 dnl Omnijar packaging (bug 552121)
 dnl =========================================================
 dnl Omnijar packaging is compatible with flat packaging.
 dnl In unpackaged builds, omnijar looks for files as if
 dnl things were flat packaged. After packaging, all files
 dnl are loaded from a single jar. MOZ_CHROME_FILE_FORMAT
 dnl is set to flat since putting files into jars is only
 dnl done during packaging with omnijar.
-if test "$MOZ_CHROME_FILE_FORMAT" = "omni"; then
-    MOZ_OMNIJAR=1
-    AC_DEFINE(MOZ_OMNIJAR)
-fi
 MOZ_PACKAGER_FORMAT="$MOZ_CHROME_FILE_FORMAT"
 if test "$OS_ARCH" = "WINNT"; then
     MOZ_CHROME_FILE_FORMAT=flat
 else
     MOZ_CHROME_FILE_FORMAT=symlink
 fi
 
 if test "$MOZ_WIDGET_TOOLKIT" = "android"; then
@@ -6277,17 +6273,16 @@ if test "$MOZ_WIDGET_TOOLKIT" = "android
     dnl etc). packager.mk handles changing the rooting of the single
     dnl omnijar.
     OMNIJAR_NAME=assets/omni.ja
 else
     OMNIJAR_NAME=omni.ja
 fi
 
 AC_SUBST(OMNIJAR_NAME)
-AC_SUBST(MOZ_OMNIJAR)
 AC_SUBST(MOZ_PACKAGER_FORMAT)
 
 dnl ========================================================
 dnl = Define default location for MOZILLA_FIVE_HOME
 dnl ========================================================
 MOZ_ARG_WITH_STRING(default-mozilla-five-home,
 [  --with-default-mozilla-five-home
                           Set the default value for MOZILLA_FIVE_HOME],
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -377,26 +377,16 @@ PKG_ARG = , '$(pkg)'
 # from the now deprecated MOZ_PKG_MANIFEST_P when MOZ_PKG_MANIFEST is not
 # defined.
 ifndef MOZ_PKG_MANIFEST
   ifdef MOZ_PKG_MANIFEST_P
     MOZ_PKG_MANIFEST := $(MOZ_PKG_MANIFEST_P)
   endif # MOZ_PKG_MANIFEST_P
 endif # MOZ_PKG_MANIFEST
 
-# For smooth transition of comm-central
-ifndef MOZ_PACKAGER_FORMAT
-  ifeq ($(MOZ_CHROME_FILE_FORMAT),flat)
-    ifdef MOZ_OMNIJAR
-      MOZ_PACKAGER_FORMAT := omni
-    else
-      MOZ_PACKAGER_FORMAT := flat
-    endif
-  endif
-endif
 ifndef MOZ_PACKAGER_FORMAT
   MOZ_PACKAGER_FORMAT = $(error MOZ_PACKAGER_FORMAT is not set)
 endif
 
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
   OPTIMIZEJARS = 1
   ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
     ifdef NIGHTLY_BUILD