[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] 2 commits: fixup! Tweaks to the build system



Title: GitLab

richard pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser

Commits:

  • b666c1c1
    by Richard Pospesel at 2023-09-20T15:52:15+00:00
    fixup! Tweaks to the build system
    
  • 953539a4
    by Richard Pospesel at 2023-09-20T15:52:15+00:00
    fixup! Bug 2176: Rebrand Firefox to TorBrowser
    

12 changed files:

Changes:

  • browser/app/moz.build
    ... ... @@ -70,7 +70,8 @@ if CONFIG["CC_TYPE"] == "clang-cl":
    70 70
     if CONFIG["OS_ARCH"] == "WINNT":
    
    71 71
         RCINCLUDE = "splash.rc"
    
    72 72
         DIRS += [
    
    73
    -        "pbproxy",
    
    73
    +        # tor-browser#41798 don't build private_browsing.exe on Windows
    
    74
    +        # "pbproxy",
    
    74 75
             "winlauncher",
    
    75 76
         ]
    
    76 77
         USE_LIBS += [
    

  • browser/branding/branding-common.mozbuild
    ... ... @@ -18,11 +18,8 @@ def FirefoxBranding():
    18 18
         if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
    
    19 19
             FINAL_TARGET_FILES['..'] += [
    
    20 20
                 'firefox.VisualElementsManifest.xml',
    
    21
    -            'private_browsing.VisualElementsManifest.xml',
    
    22 21
             ]
    
    23 22
             FINAL_TARGET_FILES.VisualElements += [
    
    24
    -            'PrivateBrowsing_150.png',
    
    25
    -            'PrivateBrowsing_70.png',
    
    26 23
                 'VisualElements_150.png',
    
    27 24
                 'VisualElements_70.png',
    
    28 25
             ]
    

  • browser/branding/tb-alpha/PrivateBrowsing_150.png deleted
    No preview for this file type
  • browser/branding/tb-alpha/PrivateBrowsing_70.png deleted
    No preview for this file type
  • browser/branding/tb-alpha/private_browsing.VisualElementsManifest.xml deleted
    1
    -<!-- This Source Code Form is subject to the terms of the Mozilla Public
    
    2
    -   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    
    3
    -   - You can obtain one at http://mozilla.org/MPL/2.0/. -->
    
    4
    -
    
    5
    -<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
    
    6
    -  <VisualElements
    
    7
    -      ShowNameOnSquare150x150Logo='on'
    
    8
    -      Square150x150Logo='browser\VisualElements\PrivateBrowsing_150.png'
    
    9
    -      Square70x70Logo='browser\VisualElements\PrivateBrowsing_70.png'
    
    10
    -      ForegroundText='light'
    
    11
    -      BackgroundColor='#1c191d'/>
    
    12
    -</Application>

  • browser/branding/tb-nightly/PrivateBrowsing_150.png deleted
    No preview for this file type
  • browser/branding/tb-nightly/PrivateBrowsing_70.png deleted
    No preview for this file type
  • browser/branding/tb-nightly/private_browsing.VisualElementsManifest.xml deleted
    1
    -<!-- This Source Code Form is subject to the terms of the Mozilla Public
    
    2
    -   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    
    3
    -   - You can obtain one at http://mozilla.org/MPL/2.0/. -->
    
    4
    -
    
    5
    -<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
    
    6
    -  <VisualElements
    
    7
    -      ShowNameOnSquare150x150Logo='on'
    
    8
    -      Square150x150Logo='browser\VisualElements\PrivateBrowsing_150.png'
    
    9
    -      Square70x70Logo='browser\VisualElements\PrivateBrowsing_70.png'
    
    10
    -      ForegroundText='light'
    
    11
    -      BackgroundColor='#1c191d'/>
    
    12
    -</Application>

  • browser/branding/tb-release/PrivateBrowsing_150.png deleted
    No preview for this file type
  • browser/branding/tb-release/PrivateBrowsing_70.png deleted
    No preview for this file type
  • browser/branding/tb-release/private_browsing.VisualElementsManifest.xml deleted
    1
    -<!-- This Source Code Form is subject to the terms of the Mozilla Public
    
    2
    -   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    
    3
    -   - You can obtain one at http://mozilla.org/MPL/2.0/. -->
    
    4
    -
    
    5
    -<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
    
    6
    -  <VisualElements
    
    7
    -      ShowNameOnSquare150x150Logo='on'
    
    8
    -      Square150x150Logo='browser\VisualElements\PrivateBrowsing_150.png'
    
    9
    -      Square70x70Logo='browser\VisualElements\PrivateBrowsing_70.png'
    
    10
    -      ForegroundText='light'
    
    11
    -      BackgroundColor='#420c5e'/>
    
    12
    -</Application>

  • browser/installer/package-manifest.in
    ... ... @@ -137,10 +137,10 @@
    137 137
     @BINPATH@/firefox.VisualElementsManifest.xml
    
    138 138
     @BINPATH@/browser/VisualElements/VisualElements_150.png
    
    139 139
     @BINPATH@/browser/VisualElements/VisualElements_70.png
    
    140
    -@BINPATH@/private_browsing.exe
    
    141
    -@BINPATH@/private_browsing.VisualElementsManifest.xml
    
    142
    -@BINPATH@/browser/VisualElements/PrivateBrowsing_150.png
    
    143
    -@BINPATH@/browser/VisualElements/PrivateBrowsing_70.png
    
    140
    +; @BINPATH@/private_browsing.exe
    
    141
    +; @BINPATH@/private_browsing.VisualElementsManifest.xml
    
    142
    +; @BINPATH@/browser/VisualElements/PrivateBrowsing_150.png
    
    143
    +; @BINPATH@/browser/VisualElements/PrivateBrowsing_70.png
    
    144 144
     #else
    
    145 145
     @BINPATH@/@MOZ_APP_NAME@-bin
    
    146 146
     @BINPATH@/@MOZ_APP_NAME@
    

  • _______________________________________________
    tor-commits mailing list
    tor-commits@xxxxxxxxxxxxxxxxxxxx
    https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits