boklm pushed to branch main at The Tor Project / Applications / 
tor-browser-build


Commits:
b0e80195 by Beatriz Rizental at 2025-10-15T09:51:52+02:00
Bug 44131: Skip copying Bundle-Data when building for macos

That folder doesn't exist anymore for macos.

- - - - -
a2e5d129 by Beatriz Rizental at 2025-10-15T09:53:45+02:00
Bug 44131: Escape backlashes when building tor-expert-bundle

This is currently breaking the Windows builds.

- - - - -


2 changed files:

- projects/browser/build
- projects/tor-expert-bundle/config


Changes:

=====================================
projects/browser/build
=====================================
@@ -219,8 +219,10 @@ do
   cp -a Bundle-Data/Docs/* "$tbdir/$DOCSPATH"
   [% IF c("var/tor-browser") -%]
     cp -a Bundle-Data/Docs-TBB/* "$tbdir/$DOCSPATH"
-    tar -C Bundle-Data/[% bundledata_osname %] \
-      -c . | tar -C "$tbdir[% IF ! c("var/macos") %]/[% c('var/ProjectName') 
%][% END %]" -x
+    [% IF ! c("var/macos") %]
+      tar -C Bundle-Data/[% bundledata_osname %] \
+        -c . | tar -C "$tbdir/[% c('var/ProjectName') %]" -x
+    [% END %]
   [% ELSIF c("var/mullvad-browser") -%]
     cp -a Bundle-Data/Docs-MB/* "$tbdir/$DOCSPATH"
   [% END -%]


=====================================
projects/tor-expert-bundle/config
=====================================
@@ -11,7 +11,8 @@ targets:
       pt_path: PluggableTransports/
   windows:
     var:
-      pt_path: TorBrowser\Tor\PluggableTransports\
+      # Backlashes need to be escaped here.
+      pt_path: TorBrowser\\Tor\\PluggableTransports\\
       pt_extension: .exe
 
 input_files:



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/43348a3bd65aada09cbcf9fc9cfb89401a304974...a2e5d129ef58059baada31acf5ec8d452f0845d3

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/43348a3bd65aada09cbcf9fc9cfb89401a304974...a2e5d129ef58059baada31acf5ec8d452f0845d3
You're receiving this email because of your account on gitlab.torproject.org.


_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to