Branding part 0

This commit is contained in:
K4sum1 2025-04-26 03:24:38 -07:00
commit b7ed146126
7 changed files with 12 additions and 31 deletions

View file

@ -1,8 +1,8 @@
WIN32_MODULE_COMPANYNAME=@MOZ_APP_VENDOR@
WIN32_MODULE_COPYRIGHT=©Basilisk and Mozilla Developers; available under the MPL 2 license.
WIN32_MODULE_COPYRIGHT=©Eclipse Community, Basilisk and Mozilla Developers; available under the MPL 2 license.
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
WIN32_MODULE_TRADEMARKS=Basilisk is a Trademark of Moonchild Productions.
WIN32_MODULE_TRADEMARKS=The Hydra logo and project names are trademarks of Eclipse Community.
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ web browser
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@

View file

@ -1,7 +1,6 @@
<!-- 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/. -->
<p><b>Binaries</b> of this product have been made available to you by the
<a href="http://www.palemoon.org/">Pale Moon project team</a> and
<a href="http://www.moonchildproductions.info/">Moonchild Productions</a> under the Mozilla
<p><b>Binaries</b> of this product have been made available to you by
<a href="http://eclipse.cx/">Eclipse Community</a> under the Mozilla
Public License 2.0 (MPL). <a href="about:rights">Know your rights</a>.</p>

View file

@ -1,8 +1,8 @@
WIN32_MODULE_COMPANYNAME=@MOZ_APP_VENDOR@
WIN32_MODULE_COPYRIGHT=©Pale Moon, Firefox and Mozilla Developers, available under the MPL 2.0.
WIN32_MODULE_COPYRIGHT=©Eclipse Community, Pale Moon, Firefox and Mozilla Developers, available under the MPL 2.0.
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
WIN32_MODULE_TRADEMARKS=The Pale Moon logo and project names are trademarks of Moonchild Productions.
WIN32_MODULE_TRADEMARKS=The Lun3r logo and project names are trademarks of Moonchild Productions.
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ web browser
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@

View file

@ -1,6 +1,6 @@
<!-- 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/. -->
<p><b>Binaries</b> of this product have been made available to you by the
<a href="http://www.palemoon.org/">Pale Moon Project</a> under the Pale Moon
Binary <a href="http://www.palemoon.org/redist.shtml">redistribution license</a>.</p>
<p><b>Binaries</b> of this product have been made available to you by
<a href="http://eclipse.cx/">Eclipse Community</a> under the Mozilla
Public License 2.0 (MPL). <a href="about:rights">Know your rights</a>.</p>

View file

@ -28,24 +28,6 @@ for _value in listConfigure:
elif _splitString[0] == "MOZ_BRANDING_DIRECTORY":
strBrandingDirectory = _splitString[1]
# Only applies if using Official Branding or specific branding directories
if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("branding/official")) or (strBrandingDirectory.endswith("branding/unstable")):
# Applies to Pale Moon and Basilisk
if ('MC_BASILISK' in listConfig) or ('MC_PALEMOON' in listConfig):
listViolations += [
'MOZ_SYSTEM_JPEG',
'MOZ_SYSTEM_ZLIB',
'MOZ_SYSTEM_BZ2',
'MOZ_SYSTEM_JEMALLOC'
]
# Applies to Pale Moon Only
if 'MC_PALEMOON' in listConfig:
listViolations += [
'MOZ_EME',
'MOZ_WEBRTC'
]
# Iterate through enabled violations and output 1 to DIRECTIVE4 if any are found
for _value in listViolations:
if _value in listConfig:

View file

@ -5439,9 +5439,9 @@ DIRECTIVE4=`$PYTHON $_topsrcdir/build/directive4.py $DIRECTIVE4_LIST`
if test -n "$DIRECTIVE4"; then
if test -n "$MC_PRIVATE_BUILD"; then
AC_MSG_WARN([Private Build - The configuration you have chosen to use with official branding deviates from official build configuration. Your build is thus for personal and private use only and must not be (re)distributed - Please see: http://www.palemoon.org/redist.shtml])
AC_MSG_WARN([Please do not redistribute this build with official branding if you are not part of Eclipse Community.])
else
AC_MSG_ERROR([Branding Violation - Please see: http://www.palemoon.org/redist.shtml])
AC_MSG_ERROR([Please use unofficial branding for this build. If you really wish to use official branding, set MC_PRIVATE_BUILD=1 as an environment variable.])
fi
fi

View file

@ -19,7 +19,7 @@
<!ENTITY rights.intro-point1b "Mozilla Public License">
<!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others. You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.">
<!ENTITY rights.intro-point2-a "You are not granted any trademark rights or licenses to the trademarks of Moonchild Productions or any other party, including without limitation the Basilisk and Pale Moon names or logos. Additional information on trademarks may be found ">
<!ENTITY rights.intro-point2-a "You are not granted any trademark rights or licenses to the trademarks of Eclipse Community or any other party, including without limitation the Hydra and Lun3r names or logos. Additional information on trademarks may be found ">
<!ENTITY rights.intro-point2-b "here">
<!ENTITY rights.intro-point2-c ".">