Commit a0e6251a authored by Beatriz Rizental's avatar Beatriz Rizental
Browse files

fixup! MB 1: Mullvad Browser branding

parent 2462093b

browser/base/content/overrides/app-license.html

+6 −3
Original line number Diff line number Diff line 
<!-- 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="https://www.torproject.org/">Tor Project</a> and <a href="https://mullvad.net/">Mullvad VPN</a> under the Mozilla

    Public License 2.0 (MPL). <a href="about:rights">Know your rights</a>.</p>
 
<p>

  <b>Binaries</b> of this product have been made available to you by the

  <a href="https://www.torproject.org/">Tor Project</a> and

  <a href="https://mullvad.net/">Mullvad VPN</a> under the Mozilla Public

  License 2.0 (MPL). <a href="about:rights">Know your rights</a>.

</p>

browser/branding/mb-alpha/moz.build

+14 −14
Original line number Diff line number Diff line
@@ -10,24 +10,24 @@ DIST_SUBDIR = "browser" 
export("DIST_SUBDIR")



JS_PREFERENCE_FILES += [

    'pref/firefox-branding.js',

    "pref/firefox-branding.js",

]



if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':

    FINAL_TARGET_FILES['..'] += [

        'mullvadbrowser.VisualElementsManifest.xml',

if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":

    FINAL_TARGET_FILES[".."] += [

        "mullvadbrowser.VisualElementsManifest.xml",

    ]

    FINAL_TARGET_FILES.VisualElements += [

        'VisualElements_150.png',

        'VisualElements_70.png',

        "VisualElements_150.png",

        "VisualElements_70.png",

    ]

elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':

elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":

    FINAL_TARGET_FILES.chrome.icons.default += [

        'content/about-logo.svg',

        'default128.png',

        'default16.png',

        'default256.png',

        'default32.png',

        'default48.png',

        'default64.png',

        "content/about-logo.svg",

        "default128.png",

        "default16.png",

        "default256.png",

        "default32.png",

        "default48.png",

        "default64.png",

    ]

browser/branding/mb-nightly/moz.build

+14 −14
Original line number Diff line number Diff line
@@ -10,24 +10,24 @@ DIST_SUBDIR = "browser" 
export("DIST_SUBDIR")



JS_PREFERENCE_FILES += [

    'pref/firefox-branding.js',

    "pref/firefox-branding.js",

]



if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':

    FINAL_TARGET_FILES['..'] += [

        'mullvadbrowser.VisualElementsManifest.xml',

if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":

    FINAL_TARGET_FILES[".."] += [

        "mullvadbrowser.VisualElementsManifest.xml",

    ]

    FINAL_TARGET_FILES.VisualElements += [

        'VisualElements_150.png',

        'VisualElements_70.png',

        "VisualElements_150.png",

        "VisualElements_70.png",

    ]

elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':

elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":

    FINAL_TARGET_FILES.chrome.icons.default += [

        'content/about-logo.svg',

        'default128.png',

        'default16.png',

        'default256.png',

        'default32.png',

        'default48.png',

        'default64.png',

        "content/about-logo.svg",

        "default128.png",

        "default16.png",

        "default256.png",

        "default32.png",

        "default48.png",

        "default64.png",

    ]

browser/branding/mb-release/moz.build

+14 −14
Original line number Diff line number Diff line
@@ -10,24 +10,24 @@ DIST_SUBDIR = "browser" 
export("DIST_SUBDIR")



JS_PREFERENCE_FILES += [

    'pref/firefox-branding.js',

    "pref/firefox-branding.js",

]



if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':

    FINAL_TARGET_FILES['..'] += [

        'mullvadbrowser.VisualElementsManifest.xml',

if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":

    FINAL_TARGET_FILES[".."] += [

        "mullvadbrowser.VisualElementsManifest.xml",

    ]

    FINAL_TARGET_FILES.VisualElements += [

        'VisualElements_150.png',

        'VisualElements_70.png',

        "VisualElements_150.png",

        "VisualElements_70.png",

    ]

elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':

elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":

    FINAL_TARGET_FILES.chrome.icons.default += [

        'content/about-logo.svg',

        'default128.png',

        'default16.png',

        'default256.png',

        'default32.png',

        'default48.png',

        'default64.png',

        "content/about-logo.svg",

        "default128.png",

        "default16.png",

        "default256.png",

        "default32.png",

        "default48.png",

        "default64.png",

    ]

config/create_rc.py

+8 −2
Original line number Diff line number Diff line
@@ -291,13 +291,19 @@ def generate_module_rc(binary="", rcinclude=None): 
        ),

        fileflags=" | ".join(flags),

        comment=overrides.get("WIN32_MODULE_COMMENT", ""),

        copyright=overrides.get("WIN32_MODULE_COPYRIGHT", "©Mullvad, Tor Browser, and Mozilla Developers; available under the MPL 2 license."),

        copyright=overrides.get(

            "WIN32_MODULE_COPYRIGHT",

            "©Mullvad, Tor Browser, and Mozilla Developers; available under the MPL 2 license.",

        ),

        company=overrides.get("WIN32_MODULE_COMPANYNAME", "Mullvad VPN AB"),

        description=overrides.get("WIN32_MODULE_DESCRIPTION", ""),

        mfversion=overrides.get("WIN32_MODULE_FILEVERSION_STRING", milestone_string),

        mpversion=overrides.get("WIN32_MODULE_PRODUCTVERSION_STRING", milestone_string),

        module=overrides.get("WIN32_MODULE_NAME", ""),

        trademarks=overrides.get("WIN32_MODULE_TRADEMARKS", "Mullvad Browser is a Trademark of Mullvad VPN AB."),

        trademarks=overrides.get(

            "WIN32_MODULE_TRADEMARKS",

            "Mullvad Browser is a Trademark of Mullvad VPN AB.",

        ),

        binary=overrides.get("WIN32_MODULE_ORIGINAL_FILENAME", binary),

        productname=overrides.get("WIN32_MODULE_PRODUCTNAME", display_name),

        buildid=buildid,