summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-02-05 05:48:29 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-02-05 05:48:29 -0500
commit2eef10791129874f6e04b446fbdbaa3b4ad61a60 (patch)
tree5b094b733321e30b5f7d0608f65b4453440750eb
parentac7d8a02b874485ec68d1b25e9ebd938f48e976e (diff)
downloadUXP-2eef10791129874f6e04b446fbdbaa3b4ad61a60.tar
UXP-2eef10791129874f6e04b446fbdbaa3b4ad61a60.tar.gz
UXP-2eef10791129874f6e04b446fbdbaa3b4ad61a60.tar.lz
UXP-2eef10791129874f6e04b446fbdbaa3b4ad61a60.tar.xz
UXP-2eef10791129874f6e04b446fbdbaa3b4ad61a60.zip
Official Vendor and Pale Moon special case
-rw-r--r--build/application.ini8
-rw-r--r--build/moz.build10
-rw-r--r--build/moz.configure/old.configure1
-rw-r--r--old-configure.in16
4 files changed, 35 insertions, 0 deletions
diff --git a/build/application.ini b/build/application.ini
index 6d27b4097..6b2e43a34 100644
--- a/build/application.ini
+++ b/build/application.ini
@@ -18,8 +18,16 @@
#include @TOPOBJDIR@/buildid.h
#include @TOPOBJDIR@/source-repo.h
[App]
+#ifdef MC_OFFICIAL
+Vendor=Moonchild Productions
+#else
Vendor=@MOZ_APP_VENDOR@
+#endif
+#if defined(MOZ_PHOENIX) && defined(MC_PALEMOON)
+Name=Pale Moon
+#else
Name=@MOZ_APP_BASENAME@
+#endif
RemotingName=@MOZ_APP_REMOTINGNAME@
#ifdef MOZ_APP_DISPLAYNAME
CodeName=@MOZ_APP_DISPLAYNAME@
diff --git a/build/moz.build b/build/moz.build
index 7b414ce12..8d86b52bf 100644
--- a/build/moz.build
+++ b/build/moz.build
@@ -27,7 +27,17 @@ if CONFIG['MOZ_APP_DISPLAYNAME'] != CONFIG['MOZ_APP_BASENAME']:
DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']
if CONFIG['MOZ_PHOENIX']:
+ DEFINES['MOZ_PHOENIX'] = CONFIG['MOZ_PHOENIX']
DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
+
+if CONFIG['MC_OFFICAL']:
+ DEFINES['MC_OFFICAL'] = CONFIG['MC_OFFICAL']
+
+if CONFIG['MC_BASILISK']:
+ DEFINES['MC_BASILISK'] = CONFIG['MC_BASILISK']
+
+if CONFIG['MC_PALEMOON']:
+ DEFINES['MC_PALEMOON'] = CONFIG['MC_PALEMOON']
if CONFIG['MOZ_APP_PROFILE']:
DEFINES['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE']
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index b32c3f7b7..581fa9c50 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -201,6 +201,7 @@ def old_configure_options(*options):
'--enable-nfc',
'--enable-nspr-build',
'--enable-official-branding',
+ '--enable-official-vendor',
'--enable-omx-plugin',
'--enable-oom-breakpoint',
'--enable-optimize',
diff --git a/old-configure.in b/old-configure.in
index ab15abf69..5942b0139 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2261,6 +2261,7 @@ MOZ_ARG_HEADER(Application)
ENABLE_SYSTEM_EXTENSION_DIRS=1
MOZ_BRANDING_DIRECTORY=
MOZ_OFFICIAL_BRANDING=
+MC_OFFICIAL=1
MOZ_FEEDS=1
MOZ_AUTH_EXTENSION=1
if test "$MOZ_IOS"; then
@@ -2344,6 +2345,15 @@ fi
AC_SUBST(MOZ_ANDROID_DISTRIBUTION_DIRECTORY)
dnl ========================================================
+dnl = Vendor override
+dnl ========================================================
+MOZ_ARG_DISABLE_BOOL(official-vendor,
+[ --disable-official-vendor Disable the use of official vendor.],
+ MC_OFFICIAL=,
+ MC_OFFICIAL=1)
+
+
+dnl ========================================================
dnl = Trademarked Branding
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(official-branding,
@@ -2587,9 +2597,15 @@ if test -n "$MOZ_OFFICIAL_BRANDING"; then
else
MOZ_BRANDING_DIRECTORY=${MOZ_OFFICIAL_BRANDING_DIRECTORY}
AC_DEFINE(MOZ_OFFICIAL_BRANDING)
+ MC_OFFICIAL=1
fi
fi
+AC_SUBST(MC_OFFICIAL)
+if test -n "$MC_OFFICIAL"; then
+ AC_DEFINE(MC_OFFICIAL)
+fi
+
MOZ_ARG_WITH_STRING(branding,
[ --with-branding=dir Use branding from the specified directory.],
MOZ_BRANDING_DIRECTORY=$withval)