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

[tor-commits] [Git][tpo/applications/tor-browser-build][maint-13.5] Bug 41269: Fix Windows browser build break due to missing snowflake README.md



Title: GitLab

Pier Angelo Vendrame pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build

Commits:

  • 2ada0c7b
    by Morgan at 2024-10-24T18:45:00+00:00
    Bug 41269: Fix Windows browser build break due to missing snowflake README.md
    

2 changed files:

Changes:

  • projects/browser/build
    ... ... @@ -108,9 +108,14 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b
    108 108
       [% END -%]
    
    109 109
     
    
    110 110
       # Move READMEs from tor-expert-bundle to the doc dir
    
    111
    -  mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %]
    
    111
    +  # Windows does not have snowflake
    
    112
    +  [% IF !c("var/windows") -%]
    
    113
    +    mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %]
    
    114
    +  [% END -%]
    
    112 115
       mkdir -p "$TBDIR/$DOCSPATH/conjure" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/conjure"[% END %]
    
    113
    -  mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md"
    
    116
    +  [% IF !c("var/windows") -%]
    
    117
    +    mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md"
    
    118
    +  [% END -%]
    
    114 119
       mv_tbdir tor/pluggable_transports/README.CONJURE.md "$DOCSPATH/conjure/README.md"
    
    115 120
     
    
    116 121
       # Move the PTs to where TB expects them
    

  • rbm.conf
    ... ... @@ -74,7 +74,7 @@ buildconf:
    74 74
     
    
    75 75
     var:
    
    76 76
       torbrowser_version: '13.5.9'
    
    77
    -  torbrowser_build: 'build1'
    
    77
    +  torbrowser_build: 'build2'
    
    78 78
       # This should be the date of when the build is started. For the build
    
    79 79
       # to be reproducible, browser_release_date should always be in the past.
    
    80 80
       browser_release_date: '2024/10/24 16:02:53'
    

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