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

[tor-commits] [Git][tpo/applications/tor-browser-build][maint-12.5] Bug 31546: Copy Firefox PDBs for Windows

Title: GitLab

richard pushed to branch maint-12.5 at The Tor Project / Applications / tor-browser-build

Commits:

  • 3ba21986
    by Pier Angelo Vendrame at 2023-07-31T20:37:13+00:00 
    Bug 31546: Copy Firefox PDBs for Windows

Also copy debug symbols after stripping on Linux 32-bit (we only copied
them in Linux 64-bit) and for all our browsers (previously we copied
them only for Tor Browser).

Include the headers directory with the symbols, because some of them
are generated during the build, but they are needed for debugging.

2 changed files:

Changes:

  • projects/browser/build
    ... ... @@ -397,13 +397,13 @@ SCRIPT_EOF
    397 397 
     [% IF c("var/updater_enabled") -%]
    398 398 
       cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
    399 399 
     [% END -%]
    400 
    -[% IF c("var/linux-x86_64") -%]
    401 
    -  [% IF c("var/tor-browser") -%]
    402 
    -    cp $rootdir/[% c('input_files_by_name/firefox') %]/browser-debug.tar.xz "$OUTDIR"/[% c("var/project-name") %]-[% c("var/mar_osname") %]-debug.tar.xz
    403 
    -  [% END -%]
    404 
    -  [% IF !c("var/asan") -%]
    405 
    -    cp $rootdir/[% c('input_files_by_name/firefox') %]/geckodriver-linux64.tar.xz "$OUTDIR"/
    400 
    +[% IF c("var/linux") -%]
    401 
    +  cp $rootdir/[% c('input_files_by_name/firefox') %]/browser-debug.tar.xz "$OUTDIR/[% c('var/project-name') %]-[% c('var/mar_osname') %]-debug.tar.xz"
    402 
    +  [% IF c("var/linux-x86_64") && !c("var/asan") -%]
    403 
    +    cp $rootdir/[% c('input_files_by_name/firefox') %]/geckodriver.tar.xz "$OUTDIR/geckodriver-[% c('var/mar_osname') %].tar.xz"
    406 404 
       [% END -%]
    405 
    +[% ELSIF c("var/windows") -%]
    406 
    +  cp $rootdir/[% c('input_files_by_name/firefox') %]/browser-debug.zip "$OUTDIR/[% c('var/project-name') %]-[% c('var/mar_osname') %]-debug.zip"
    407 407 
     [% END -%]
    408 408 
     [%IF c("var/tor-browser") -%]
    409 409 
       tor_expert_bundle_src="[% c("input_files_by_name/tor-expert-bundle") %]"

  • projects/firefox/build
    ... ... @@ -211,6 +211,10 @@ export LANG=C.UTF-8
    211 211 
         cp obj-*/testing/geckodriver/x86_64-unknown-linux-gnu/release/geckodriver $distdir
    212 212 
       [% END %]
    213 213 
       cp -a obj-*/dist/[% c('var/exe_name') %]/* $distdir/Browser/
    214 
    +  mkdir -p $distdir/Debug
    215 
    +  # Some include files are symlinks, so use -Lr, or the tarball will fail
    216 
    +  # silently. Also, on Linux we populate the debug symbols by stripping later.
    217 
    +  cp -Lr obj-*/dist/include $distdir/Debug/
    214 218 
       # Remove firefox-bin (we don't use it, see ticket #10126)
    215 219 
       rm -f "$distdir/Browser/[% c('var/exe_name') %]-bin"
    216 220 
       # TODO: There goes FIPS-140.. We could upload these somewhere unique and
    ... ... @@ -232,6 +236,11 @@ RBM_TB_EOF
    232 236 
       [% ELSE %]
    233 237 
         cp -a /var/tmp/dist/fxc2/bin/d3dcompiler_47.dll $distdir/Browser
    234 238 
       [% END %]
    239 
    +  mkdir -p $distdir/Debug/Browser
    240 
    +  pushd obj-*
    241 
    +  cp -Lr dist/include $distdir/Debug/
    242 
    +  find . \( -path ./dist -o -path ./_tests \) -prune -o -name '*.pdb' -exec cp -l {} $distdir/Debug/Browser/ \;
    243 
    +  popd
    235 244 
     [% END %]
    236 245
    237 246 
     [% IF c("var/updater_enabled") -%]
    ... ... @@ -279,8 +288,8 @@ RBM_TB_EOF
    279 288
    280 289 
     cd $distdir
    281 290
    282 
    -[% IF c("var/linux-x86_64") %]
    283 
    -  [% IF !c("var/asan") %]
    291 
    +[% IF c("var/linux") -%]
    292 
    +  [% IF c("var/linux-x86_64") && !c("var/asan") -%]
    284 293 
         # No need for an unstripped geckodriver
    285 294 
         strip geckodriver
    286 295 
       [% END %]
    ... ... @@ -334,17 +343,22 @@ END;
    334 343 
             tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/browser.tar.gz',
    335 344 
         }) %]
    336 345
    337 
    -[% IF c("var/linux-x86_64") %]
    346 
    +[% IF c("var/linux") -%]
    338 347 
     [% c('tar', {
    339 348 
             tar_src => [ 'Debug' ],
    340 349 
             tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/browser-debug.tar.xz',
    341 350 
         }) %]
    342 
    -  [% IF !c("var/asan") %]
    351 
    +  [% IF c("var/linux-x86_64") && !c("var/asan") -%]
    343 352 
         [% c('tar', {
    344 353 
                 tar_src => [ 'geckodriver' ],
    345 354 
                 tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/geckodriver-linux64.tar.xz',
    346 355 
             }) %]
    347 356 
       [% END %]
    357 
    +[% ELSIF c("var/windows") -%]
    358 
    +  [% c('zip', {
    359 
    +      zip_src => [ 'Debug' ],
    360 
    +      zip_args => dest_dir _ '/' _ c('filename') _ '/browser-debug.zip',
    361 
    +    }) %]
    348 362 
     [% END %]
    349 363
    350 364 
     [% IF c("var/updater_enabled") -%]

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

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