Bug 933803 - Add a note to application.ini that it needs to be moved under browser/. r=ted, a=lsblakk
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 06 Nov 2013 14:22:33 +0900
changeset 161011 aa4f3e9c4f95bbdaa1aa0b0afa325973212a1315
parent 161010 2651bf79654441b42dc26d8059253af09e7f6ff3
child 161012 8f44e7a03c4cec983fe5e50ce64cdaf04ef33698
push id2990
push userryanvm@gmail.com
push dateThu, 07 Nov 2013 20:14:53 +0000
treeherdermozilla-beta@5a0e7c8843a2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, lsblakk
bugs933803
milestone26.0
Bug 933803 - Add a note to application.ini that it needs to be moved under browser/. r=ted, a=lsblakk
build/Makefile.in
build/application.ini
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -42,16 +42,20 @@ endif
 DEFINES += \
   -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \
   -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" \
   -DMOZ_APP_ID="$(MOZ_APP_ID)" \
   -DMAR_CHANNEL_ID="$(MAR_CHANNEL_ID)" \
   -DACCEPTED_MAR_CHANNEL_IDS="$(ACCEPTED_MAR_CHANNEL_IDS)" \
   $(NULL)
 
+ifeq ($(MOZ_BUILD_APP),browser)
+DEFINES += -DMOZ_BUILD_APP_IS_BROWSER
+endif
+
 ifdef MOZ_APP_PROFILE
 DEFINES += -DMOZ_APP_PROFILE="$(MOZ_APP_PROFILE)"
 endif
 
 ifdef MOZ_CRASHREPORTER
 DEFINES += -DMOZ_CRASHREPORTER
 endif
 
--- a/build/application.ini
+++ b/build/application.ini
@@ -1,13 +1,19 @@
 #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
 [App]
 Vendor=@MOZ_APP_VENDOR@