morgan pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build
Commits:
-
88c9740a
by Morgan at 2024-10-23T20:20:07+00:00
3 changed files:
Changes:
| ... | ... | @@ -77,7 +77,7 @@ targets: |
| 77 | 77 | windows:
|
| 78 | 78 | var:
|
| 79 | 79 | GOOS: windows
|
| 80 | - use_go_1_20: '[% c("origin_project") != "snowflake" %]'
|
|
| 80 | + use_go_1_20: 1
|
|
| 81 | 81 | windows-i686:
|
| 82 | 82 | var:
|
| 83 | 83 | GOARCH: 386
|
| ... | ... | @@ -14,12 +14,21 @@ cd tor |
| 14 | 14 | mkdir pluggable_transports && cd pluggable_transports
|
| 15 | 15 | |
| 16 | 16 | tar -xkf $rootdir/[% c('input_files_by_name/lyrebird') %]
|
| 17 | +# do not include snowflake-client on Windows targets
|
|
| 18 | +[% IF !c("var/windows") -%]
|
|
| 17 | 19 | tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]
|
| 20 | +[% END %]
|
|
| 18 | 21 | tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]
|
| 19 | 22 | |
| 20 | 23 | # add per-platform pt extension
|
| 21 | 24 | awk '{gsub(/\$\{pt_extension\}/, "[% c("var/pt_extension") %]"); print}' $rootdir/pt_config.json > pt_config.json
|
| 22 | 25 | |
| 26 | +# remove snowflake entires on Windows targets
|
|
| 27 | +[% IF c("var/windows") -%]
|
|
| 28 | +# remove snowflake pt and bridge entries
|
|
| 29 | +jq 'del(.pluggableTransports.snowflake, .bridges.snowflake)' pt_config.json > tmp.pt_config.json && mv tmp.pt_config.json pt_config.json
|
|
| 30 | +[% END %]
|
|
| 31 | + |
|
| 23 | 32 | cd $distdir
|
| 24 | 33 | |
| 25 | 34 | # package a .aar on android
|
| ... | ... | @@ -5,6 +5,10 @@ version: '[% c("var/torbrowser_version") %]' |
| 5 | 5 | container:
|
| 6 | 6 | use_container: 1
|
| 7 | 7 | |
| 8 | +var:
|
|
| 9 | + deps:
|
|
| 10 | + - jq
|
|
| 11 | + |
|
| 8 | 12 | targets:
|
| 9 | 13 | windows:
|
| 10 | 14 | var:
|
| ... | ... | @@ -18,6 +22,7 @@ input_files: |
| 18 | 22 | project: lyrebird
|
| 19 | 23 | - name: snowflake
|
| 20 | 24 | project: snowflake
|
| 25 | + enable: '[% !c("var/windows") %]'
|
|
| 21 | 26 | - name: conjure
|
| 22 | 27 | project: conjure
|
| 23 | 28 | - filename: pt_config.json
|