Use application specific application.ini

4 files changed, 115 insertions, 73 deletions

diff --git a/application/palemoon/app/application.ini b/application/palemoon/app/application.ini
new file mode 100644
index 0000000000..c64ed90797
--- /dev/null
+++ b/application/palemoon/app/application.ini
@@ -0,0 +1,50 @@
+#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
+
+[App]
+# Vendor=@MOZ_APP_VENDOR@
+Vendor=Moonchild Productions
+# Name=@MOZ_APP_BASENAME@
+Name=Pale Moon
+RemotingName=@MOZ_APP_REMOTINGNAME@
+#ifdef MOZ_APP_DISPLAYNAME
+CodeName=@MOZ_APP_DISPLAYNAME@
+#endif
+Version=@MOZ_APP_VERSION@
+#ifdef MOZ_APP_PROFILE
+Profile=@MOZ_APP_PROFILE@
+#endif
+BuildID=@MOZ_BUILDID@
+#ifdef MOZ_SOURCE_REPO
+SourceRepository=@MOZ_SOURCE_REPO@
+#endif
+#ifdef MOZ_SOURCE_STAMP
+SourceStamp=@MOZ_SOURCE_STAMP@
+#endif
+ID=@MOZ_APP_ID@
+
+[Gecko]
+MinVersion=@GRE_MILESTONE@
+MaxVersion=@GRE_MILESTONE@
+
+[XRE]
+#ifdef MOZ_PROFILE_MIGRATOR
+EnableProfileMigrator=1
+#endif
\ No newline at end of file
diff --git a/browser/app/application.ini b/browser/app/application.ini
new file mode 100644
index 0000000000..05317eee91
--- /dev/null
+++ b/browser/app/application.ini
@@ -0,0 +1,50 @@
+#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
+
+[App]
+# Vendor=@MOZ_APP_VENDOR@
+Vendor=Moonchild Productions
+# Name=@MOZ_APP_BASENAME@
+Name=Basilisk
+RemotingName=@MOZ_APP_REMOTINGNAME@
+#ifdef MOZ_APP_DISPLAYNAME
+CodeName=@MOZ_APP_DISPLAYNAME@
+#endif
+Version=@MOZ_APP_VERSION@
+#ifdef MOZ_APP_PROFILE
+Profile=@MOZ_APP_PROFILE@
+#endif
+BuildID=@MOZ_BUILDID@
+#ifdef MOZ_SOURCE_REPO
+SourceRepository=@MOZ_SOURCE_REPO@
+#endif
+#ifdef MOZ_SOURCE_STAMP
+SourceStamp=@MOZ_SOURCE_STAMP@
+#endif
+ID=@MOZ_APP_ID@
+
+[Gecko]
+MinVersion=@GRE_MILESTONE@
+MaxVersion=@GRE_MILESTONE@
+
+[XRE]
+#ifdef MOZ_PROFILE_MIGRATOR
+EnableProfileMigrator=1
+#endif
\ No newline at end of file
diff --git a/build/application.ini b/build/application.ini
index 8f65421ed0..80cad7e9b3 100644
--- a/build/application.ini
+++ b/build/application.ini
@@ -1,62 +1,6 @@
-#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
+# Global application.ini template is not conducive to a codebase that
+# is used for multiple applications especially if they have multiple
+# branding OR spaces in their Vendor or Name so include one from the
+# application source directory instead.
 #filter substitution
-#include @TOPOBJDIR@/buildid.h
-#include @TOPOBJDIR@/source-repo.h
-[App]
-#ifdef MC_OFFICIAL
-#if defined(MC_PALEMOON) || defined(MC_BASILISK)
-Vendor=Moonchild Productions
-#elif defined(BINOC_BOREALIS)
-Vendor=Binary Outcast
-#else
-Vendor=@MOZ_APP_VENDOR@
-#endif
-#else
-Vendor=@MOZ_APP_VENDOR@
-#endif
-#ifdef MC_PALEMOON
-Name=Pale Moon
-#else
-Name=@MOZ_APP_BASENAME@
-#endif
-RemotingName=@MOZ_APP_REMOTINGNAME@
-#ifdef MOZ_APP_DISPLAYNAME
-CodeName=@MOZ_APP_DISPLAYNAME@
-#endif
-Version=@MOZ_APP_VERSION@
-#ifdef MOZ_APP_PROFILE
-Profile=@MOZ_APP_PROFILE@
-#endif
-BuildID=@MOZ_BUILDID@
-#ifdef MOZ_SOURCE_REPO
-SourceRepository=@MOZ_SOURCE_REPO@
-#endif
-#ifdef MOZ_SOURCE_STAMP
-SourceStamp=@MOZ_SOURCE_STAMP@
-#endif
-ID=@MOZ_APP_ID@
-
-[Gecko]
-MinVersion=@GRE_MILESTONE@
-MaxVersion=@GRE_MILESTONE@
-
-[XRE]
-#ifdef MOZ_PROFILE_MIGRATOR
-EnableProfileMigrator=1
-#endif
-
+#include @TOPSRCDIR@/@MOZ_BUILD_APP@/app/application.ini
diff --git a/build/moz.build b/build/moz.build
index d96724cadd..616a64c3fe 100644
--- a/build/moz.build
+++ b/build/moz.build
@@ -18,9 +18,15 @@ else:
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     DIRS += ['annotationProcessors']
 
-for var in ('GRE_MILESTONE', 'MOZ_APP_VERSION', 'MOZ_APP_BASENAME',
-            'MOZ_APP_VENDOR', 'MOZ_APP_ID', 'MAR_CHANNEL_ID',
-            'ACCEPTED_MAR_CHANNEL_IDS', 'MOZ_APP_REMOTINGNAME'):
+for var in ('GRE_MILESTONE',
+            'MOZ_APP_VERSION',
+            'MOZ_APP_BASENAME',
+            'MOZ_APP_VENDOR',
+            'MOZ_APP_ID',
+            'MAR_CHANNEL_ID',
+            'ACCEPTED_MAR_CHANNEL_IDS',
+            'MOZ_APP_REMOTINGNAME',
+            'MOZ_BUILD_APP'):
     DEFINES[var] = CONFIG[var]
 
 if CONFIG['MOZ_APP_DISPLAYNAME'] != CONFIG['MOZ_APP_BASENAME']:
@@ -33,15 +39,6 @@ if CONFIG['MOZ_PHOENIX']:
 if CONFIG['MC_OFFICIAL']:
     DEFINES['MC_OFFICIAL'] = CONFIG['MC_OFFICIAL']
 
-if CONFIG['MC_BASILISK']:
-    DEFINES['MC_BASILISK'] = CONFIG['MC_BASILISK']
-
-if CONFIG['MC_PALEMOON']:
-    DEFINES['MC_PALEMOON'] = CONFIG['MC_PALEMOON']
-
-if CONFIG['BINOC_BOREALIS']:
-    DEFINES['BINOC_BOREALIS'] = CONFIG['BINOC_BOREALIS']
-
 if CONFIG['MOZ_APP_PROFILE']:
     DEFINES['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE']
 
@@ -86,6 +83,7 @@ if CONFIG['MOZ_APP_BASENAME']:
         appini.script = 'appini_header.py'
         appini.inputs = ['!/dist/bin/application.ini']
 
+DEFINES['TOPSRCDIR'] = TOPSRCDIR
 DEFINES['TOPOBJDIR'] = TOPOBJDIR
 
 # NOTE: Keep .gdbinit in the topsrcdir for people who run gdb from the topsrcdir.