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

[richard (@richard)]

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:

- browser/app/moz.build
- browser/branding/branding-common.mozbuild
- − browser/branding/tb-alpha/PrivateBrowsing_150.png
- − browser/branding/tb-alpha/PrivateBrowsing_70.png
- − browser/branding/tb-alpha/private_browsing.VisualElementsManifest.xml
- − browser/branding/tb-nightly/PrivateBrowsing_150.png
- − browser/branding/tb-nightly/PrivateBrowsing_70.png
- − browser/branding/tb-nightly/private_browsing.VisualElementsManifest.xml
- − browser/branding/tb-release/PrivateBrowsing_150.png
- − browser/branding/tb-release/PrivateBrowsing_70.png
- − browser/branding/tb-release/private_browsing.VisualElementsManifest.xml
- browser/installer/package-manifest.in


Changes:

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


=====================================
browser/branding/branding-common.mozbuild
=====================================
@@ -18,11 +18,8 @@ def FirefoxBranding():
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         FINAL_TARGET_FILES['..'] += [
             'firefox.VisualElementsManifest.xml',
-            'private_browsing.VisualElementsManifest.xml',
         ]
         FINAL_TARGET_FILES.VisualElements += [
-            'PrivateBrowsing_150.png',
-            'PrivateBrowsing_70.png',
             'VisualElements_150.png',
             'VisualElements_70.png',
         ]


=====================================
browser/branding/tb-alpha/PrivateBrowsing_150.png deleted
=====================================
Binary files a/browser/branding/tb-alpha/PrivateBrowsing_150.png and /dev/null differ


=====================================
browser/branding/tb-alpha/PrivateBrowsing_70.png deleted
=====================================
Binary files a/browser/branding/tb-alpha/PrivateBrowsing_70.png and /dev/null differ


=====================================
browser/branding/tb-alpha/private_browsing.VisualElementsManifest.xml deleted
=====================================
@@ -1,12 +0,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/. -->
-
-<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-  <VisualElements
-      ShowNameOnSquare150x150Logo='on'
-      Square150x150Logo='browser\VisualElements\PrivateBrowsing_150.png'
-      Square70x70Logo='browser\VisualElements\PrivateBrowsing_70.png'
-      ForegroundText='light'
-      BackgroundColor='#1c191d'/>
-</Application>


=====================================
browser/branding/tb-nightly/PrivateBrowsing_150.png deleted
=====================================
Binary files a/browser/branding/tb-nightly/PrivateBrowsing_150.png and /dev/null differ


=====================================
browser/branding/tb-nightly/PrivateBrowsing_70.png deleted
=====================================
Binary files a/browser/branding/tb-nightly/PrivateBrowsing_70.png and /dev/null differ


=====================================
browser/branding/tb-nightly/private_browsing.VisualElementsManifest.xml deleted
=====================================
@@ -1,12 +0,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/. -->
-
-<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-  <VisualElements
-      ShowNameOnSquare150x150Logo='on'
-      Square150x150Logo='browser\VisualElements\PrivateBrowsing_150.png'
-      Square70x70Logo='browser\VisualElements\PrivateBrowsing_70.png'
-      ForegroundText='light'
-      BackgroundColor='#1c191d'/>
-</Application>


=====================================
browser/branding/tb-release/PrivateBrowsing_150.png deleted
=====================================
Binary files a/browser/branding/tb-release/PrivateBrowsing_150.png and /dev/null differ


=====================================
browser/branding/tb-release/PrivateBrowsing_70.png deleted
=====================================
Binary files a/browser/branding/tb-release/PrivateBrowsing_70.png and /dev/null differ


=====================================
browser/branding/tb-release/private_browsing.VisualElementsManifest.xml deleted
=====================================
@@ -1,12 +0,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/. -->
-
-<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-  <VisualElements
-      ShowNameOnSquare150x150Logo='on'
-      Square150x150Logo='browser\VisualElements\PrivateBrowsing_150.png'
-      Square70x70Logo='browser\VisualElements\PrivateBrowsing_70.png'
-      ForegroundText='light'
-      BackgroundColor='#420c5e'/>
-</Application>


=====================================
browser/installer/package-manifest.in
=====================================
@@ -137,10 +137,10 @@
 @BINPATH@/firefox.VisualElementsManifest.xml
 @BINPATH@/browser/VisualElements/VisualElements_150.png
 @BINPATH@/browser/VisualElements/VisualElements_70.png
- at BINPATH@/private_browsing.exe
- at BINPATH@/private_browsing.VisualElementsManifest.xml
- at BINPATH@/browser/VisualElements/PrivateBrowsing_150.png
- at BINPATH@/browser/VisualElements/PrivateBrowsing_70.png
+; @BINPATH@/private_browsing.exe
+; @BINPATH@/private_browsing.VisualElementsManifest.xml
+; @BINPATH@/browser/VisualElements/PrivateBrowsing_150.png
+; @BINPATH@/browser/VisualElements/PrivateBrowsing_70.png
 #else
 @BINPATH@/@MOZ_APP_NAME at -bin
 @BINPATH@/@MOZ_APP_NAME@



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c6b08be6b983f633740393b259880d936f9a6f91...953539a414c5bcdc6d7276ecafd8d4e9f46cf8a8

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c6b08be6b983f633740393b259880d936f9a6f91...953539a414c5bcdc6d7276ecafd8d4e9f46cf8a8
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230920/bfe5ed22/attachment-0001.htm>