Bug 1330875 - Remove MOZ_APP_STATIC_INI. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 13 Jan 2017 14:51:07 +0900
changeset 376658 721d939dc97b1779c2fbeee125356a99564e9b4e
parent 376657 ef5bd9f2e0cb44e27c5c233b19a266ca646c86e8
child 376659 6d5214fa22767f4cf7617633daefa11b41e605d0
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1330875
milestone53.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 1330875 - Remove MOZ_APP_STATIC_INI. r=mshal It's now always set, even on comm-central, so we can just remote it.
b2g/confvars.sh
b2g/graphene/confvars.sh
browser/confvars.sh
build/application.ini.in
build/moz.build
mobile/android/confvars.sh
old-configure.in
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -13,17 +13,16 @@ MOZ_UA_OS_AGNOSTIC=1
 MOZ_B2G_VERSION=2.6.0.0-prerelease
 MOZ_B2G_OS_NAME=Boot2Gecko
 
 MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
 MOZ_NO_SMART_CARDS=1
-MOZ_APP_STATIC_INI=1
 
 if test "$OS_TARGET" = "Android"; then
 MOZ_CAPTURE=1
 MOZ_RAW=1
 MOZ_AUDIO_CHANNEL_MANAGER=1
 fi
 
 # use custom widget for html:select
--- a/b2g/graphene/confvars.sh
+++ b/b2g/graphene/confvars.sh
@@ -22,17 +22,16 @@ MOZ_B2G_OS_NAME=Boot2Gecko
 
 MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
 MOZ_CAPTIVEDETECT=1
 
 MOZ_NO_SMART_CARDS=1
-MOZ_APP_STATIC_INI=1
 NSS_NO_LIBPKIX=1
 
 if test "$OS_TARGET" = "Android"; then
 MOZ_CAPTURE=1
 MOZ_RAW=1
 MOZ_AUDIO_CHANNEL_MANAGER=1
 fi
 
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -50,17 +50,16 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/
 MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=firefox-mozilla-central
 MOZ_PROFILE_MIGRATOR=1
-MOZ_APP_STATIC_INI=1
 MOZ_WEBGL_CONFORMANT=1
 MOZ_JSDOWNLOADS=1
 MOZ_RUST_MP4PARSE=1
 
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1
 
 # Include the DevTools client, not just the server (which is the default)
--- a/build/application.ini.in
+++ b/build/application.ini.in
@@ -1,19 +1,17 @@
-#if MOZ_APP_STATIC_INI
 #ifdef MOZ_BUILD_APP_IS_BROWSER
 ; This file is not used. If you modify it and want the application to use
 ; your modifications, move it under the browser/ subdirectory and start with
 ; the "-app /path/to/browser/application.ini" argument.
 #else
 ; This file is not used. If you modify it and want the application to use
 ; your modifications, start with the "-app /path/to/application.ini"
 ; argument.
 #endif
-#endif
 #if 0
 ; 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/.
 #endif
 #filter substitution
 #include @TOPOBJDIR@/buildid.h
 #include @TOPOBJDIR@/source-repo.h
--- a/build/moz.build
+++ b/build/moz.build
@@ -59,37 +59,35 @@ if CONFIG['MOZ_APP_BASENAME']:
         appini_defines['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']
 
     if CONFIG['MOZ_BUILD_APP'] == 'browser':
         appini_defines['MOZ_BUILD_APP_IS_BROWSER'] = True
 
     if CONFIG['MOZ_APP_PROFILE']:
         appini_defines['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE']
 
-    for var in ('MOZ_CRASHREPORTER', 'MOZ_PROFILE_MIGRATOR',
-                'MOZ_APP_STATIC_INI'):
+    for var in ('MOZ_CRASHREPORTER', 'MOZ_PROFILE_MIGRATOR'):
         if CONFIG[var]:
             appini_defines[var] = True
 
     GENERATED_FILES += ['application.ini']
 
     appini = GENERATED_FILES['application.ini']
     appini.script = '../python/mozbuild/mozbuild/action/preprocessor.py:generate'
     appini.inputs = ['application.ini.in']
     appini.flags = ['-D%s=%s' % (k, '1' if v is True else v)
                     for k, v in appini_defines.iteritems()]
     FINAL_TARGET_FILES += ['!application.ini']
     if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android' and CONFIG['MOZ_UPDATER']:
         FINAL_TARGET_PP_FILES += ['update-settings.ini']
 
-    if CONFIG['MOZ_APP_STATIC_INI']:
-        GENERATED_FILES += ['application.ini.h']
-        appini = GENERATED_FILES['application.ini.h']
-        appini.script = 'appini_header.py'
-        appini.inputs = ['!application.ini']
+    GENERATED_FILES += ['application.ini.h']
+    appini = GENERATED_FILES['application.ini.h']
+    appini.script = 'appini_header.py'
+    appini.inputs = ['!application.ini']
 
 # NOTE: Keep .gdbinit in the topsrcdir for people who run gdb from the topsrcdir.
 OBJDIR_FILES += ['/.gdbinit']
 
 # Put a .lldbinit in the bin directory and the objdir, to be picked up
 # automatically by LLDB when we debug executables using either of those two
 # directories as the current working directory.  The .lldbinit file will
 # load $(topsrcdir)/.lldbinit, which is where the actual debugging commands are.
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -32,18 +32,16 @@ MOZ_RAW=1
 
 MOZ_RUST_MP4PARSE=1
 
 # use custom widget for html:select
 MOZ_USE_NATIVE_POPUP_WINDOWS=1
 
 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
 
-MOZ_APP_STATIC_INI=1
-
 # Enable second screen using native Android libraries.
 MOZ_NATIVE_DEVICES=1
 
 # Enable install tracking SDK if we have Google Play support; MOZ_NATIVE_DEVICES
 # is a proxy flag for that support.
 if test "$RELEASE_OR_BETA"; then
 if test "$MOZ_NATIVE_DEVICES"; then
   MOZ_INSTALL_TRACKING=1
--- a/old-configure.in
+++ b/old-configure.in
@@ -5313,18 +5313,16 @@ AC_SUBST(MOZ_APP_VERSION_DISPLAY)
 AC_SUBST(MOZ_APP_MAXVERSION)
 AC_DEFINE_UNQUOTED(FIREFOX_VERSION,$FIREFOX_VERSION)
 AC_SUBST(FIREFOX_VERSION)
 AC_SUBST(MOZ_UA_OS_AGNOSTIC)
 if test -n "$MOZ_UA_OS_AGNOSTIC"; then
   AC_DEFINE(MOZ_UA_OS_AGNOSTIC)
 fi
 
-AC_SUBST(MOZ_APP_STATIC_INI)
-
 AC_SUBST(MOZ_PKG_SPECIAL)
 AC_SUBST(MOZ_SIMPLE_PACKAGE_NAME)
 
 AC_SUBST(MOZILLA_OFFICIAL)
 if test "$MOZILLA_OFFICIAL"; then
     AC_DEFINE(MOZILLA_OFFICIAL)
     # Build revisions should always be present in official builds
     MOZ_INCLUDE_SOURCE_INFO=1