boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
68767e58
by Nicolas Vigier at 2023-01-17T18:38:10+01:00
9 changed files:
- .gitignore
- Makefile
- README
- doc/MAKEFILE.txt
- projects/release/config
- tools/signing/android-signing
- tools/signing/set-config
- tools/signing/sync-local-to-builder
- tools/signing/wait-for-finished-build
Changes:
| ... | ... | @@ -2,9 +2,8 @@ |
| 2 | 2 | /hg_clones
|
| 3 | 3 | /gclient
|
| 4 | 4 | /out
|
| 5 | -/release
|
|
| 6 | -/alpha
|
|
| 7 | -/nightly
|
|
| 5 | +/torbrowser
|
|
| 6 | +/basebrowser
|
|
| 8 | 7 | /testbuild
|
| 9 | 8 | /rbm.local.conf
|
| 10 | 9 | /logs
|
| ... | ... | @@ -187,39 +187,39 @@ signtag-alpha: submodule-update |
| 187 | 187 | $(rbm) build release --step signtag --target alpha
|
| 188 | 188 | |
| 189 | 189 | incrementals-release: submodule-update
|
| 190 | - $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals
|
|
| 190 | + $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target torbrowser
|
|
| 191 | 191 | tools/update-responses/download_missing_versions release
|
| 192 | 192 | tools/update-responses/gen_incrementals release
|
| 193 | - $(rbm) build release --step hash_incrementals --target release
|
|
| 193 | + $(rbm) build release --step hash_incrementals --target release --target torbrowser
|
|
| 194 | 194 | |
| 195 | 195 | incrementals-alpha: submodule-update
|
| 196 | - $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals
|
|
| 196 | + $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser
|
|
| 197 | 197 | tools/update-responses/download_missing_versions alpha
|
| 198 | 198 | tools/update-responses/gen_incrementals alpha
|
| 199 | - $(rbm) build release --step hash_incrementals --target alpha
|
|
| 199 | + $(rbm) build release --step hash_incrementals --target alpha --target torbrowser
|
|
| 200 | 200 | |
| 201 | 201 | incrementals-nightly: submodule-update
|
| 202 | - $(rbm) build release --step update_responses_config --target nightly
|
|
| 202 | + $(rbm) build release --step update_responses_config --target nightly --target torbrowser
|
|
| 203 | 203 | NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly
|
| 204 | - $(rbm) build release --step hash_incrementals --target nightly
|
|
| 204 | + $(rbm) build release --step hash_incrementals --target nightly --target torbrowser
|
|
| 205 | 205 | |
| 206 | 206 | update_responses-release: submodule-update
|
| 207 | - $(rbm) build release --step update_responses_config --target release --target signed
|
|
| 208 | - $(rbm) build release --step create_update_responses_tar --target release --target signed
|
|
| 207 | + $(rbm) build release --step update_responses_config --target release --target signed --target torbrowser
|
|
| 208 | + $(rbm) build release --step create_update_responses_tar --target release --target signed --target torbrowser
|
|
| 209 | 209 | |
| 210 | 210 | update_responses-alpha: submodule-update
|
| 211 | - $(rbm) build release --step update_responses_config --target alpha --target signed
|
|
| 212 | - $(rbm) build release --step create_update_responses_tar --target alpha --target signed
|
|
| 211 | + $(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser
|
|
| 212 | + $(rbm) build release --step create_update_responses_tar --target alpha --target signed --target torbrowser
|
|
| 213 | 213 | |
| 214 | 214 | dmg2mar-release: submodule-update
|
| 215 | - $(rbm) build release --step update_responses_config --target release --target signed
|
|
| 216 | - $(rbm) build release --step dmg2mar --target release --target signed
|
|
| 215 | + $(rbm) build release --step update_responses_config --target release --target signed --target torbrowser
|
|
| 216 | + $(rbm) build release --step dmg2mar --target release --target signed --target torbrowser
|
|
| 217 | 217 | tools/update-responses/download_missing_versions release
|
| 218 | 218 | CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
|
| 219 | 219 | |
| 220 | 220 | dmg2mar-alpha: submodule-update
|
| 221 | - $(rbm) build release --step update_responses_config --target alpha --target signed
|
|
| 222 | - $(rbm) build release --step dmg2mar --target alpha --target signed
|
|
| 221 | + $(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser
|
|
| 222 | + $(rbm) build release --step dmg2mar --target alpha --target signed --target torbrowser
|
|
| 223 | 223 | tools/update-responses/download_missing_versions alpha
|
| 224 | 224 | CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
|
| 225 | 225 |
| ... | ... | @@ -70,9 +70,10 @@ channel you want to build: |
| 70 | 70 | $ make torbrowser-alpha
|
| 71 | 71 | $ make torbrowser-nightly
|
| 72 | 72 | |
| 73 | -You can find the build result in the directory release/unsigned/$version
|
|
| 74 | -or alpha/unsigned/$version for release or alpha builds. The result of
|
|
| 75 | -nightly can be found in the nightly/$version directory.
|
|
| 73 | +You can find the build result in the directory
|
|
| 74 | +torbrowser/release/unsigned/$version or torbrowser/alpha/unsigned/$version
|
|
| 75 | +for release or alpha builds. The result of nightly can be found in the
|
|
| 76 | +torbrowser/nightly/$version directory.
|
|
| 76 | 77 | |
| 77 | 78 | If you want to build for a specific platform only, append the platform
|
| 78 | 79 | name to the makefile target:
|
| ... | ... | @@ -5,7 +5,7 @@ Description of makefile rules |
| 5 | 5 | torbrowser-release
|
| 6 | 6 | ------------------
|
| 7 | 7 | Build Tor Browser for the release channel, for all supported platforms.
|
| 8 | -The resulting build can be found in directory release/$version.
|
|
| 8 | +The resulting build can be found in directory torbrowser/release/$version.
|
|
| 9 | 9 | |
| 10 | 10 | torbrowser-release-{linux-x86_64,linux-i686,windows-i686,macos,
|
| 11 | 11 | android-armv7, android-x86,android-x86_64,
|
| ... | ... | @@ -18,7 +18,7 @@ android for all architectures we support. |
| 18 | 18 | torbrowser-alpha
|
| 19 | 19 | ----------------
|
| 20 | 20 | Build Tor Browser for the alpha channel, for all supported platforms.
|
| 21 | -The resulting build can be found in directory alpha/$version.
|
|
| 21 | +The resulting build can be found in directory torbrowser/alpha/$version.
|
|
| 22 | 22 | |
| 23 | 23 | torbrowser-alpha-{linux-x86_64,linux-i686,windows-i686,macos,
|
| 24 | 24 | android-armv7,android-x86,android-x86_64,
|
| ... | ... | @@ -33,7 +33,7 @@ Many of the components will be based on the main branch. You might |
| 33 | 33 | want to run "make fetch" before, to fetch the latest commits from all
|
| 34 | 34 | components.
|
| 35 | 35 | |
| 36 | -The resulting build can be found in directory nightly/$date
|
|
| 36 | +The resulting build can be found in directory torbrowser/nightly/$date
|
|
| 37 | 37 | |
| 38 | 38 | torbrowser-nightly-{linux-x86_64,linux-i686,windows-i686,macos,
|
| 39 | 39 | android-armv7,android-x86,android-x86_64,
|
| 1 | 1 | # vim: filetype=yaml sw=2
|
| 2 | 2 | version: '[% c("var/torbrowser_version") %]'
|
| 3 | -output_dir: release
|
|
| 3 | +output_dir: '[% c("var/projectname", { output_dir => "." }) %]/release'
|
|
| 4 | 4 | link_input_files: 1
|
| 5 | 5 | |
| 6 | 6 | var:
|
| ... | ... | @@ -99,13 +99,13 @@ targets: |
| 99 | 99 | build_target: release
|
| 100 | 100 | |
| 101 | 101 | nightly:
|
| 102 | - output_dir: 'nightly'
|
|
| 102 | + output_dir: '[% c("var/projectname", { output_dir => "." }) %]/nightly'
|
|
| 103 | 103 | var:
|
| 104 | 104 | build_target: nightly
|
| 105 | 105 | publish_dir: '[% c("version") %]'
|
| 106 | 106 | |
| 107 | 107 | alpha:
|
| 108 | - output_dir: alpha
|
|
| 108 | + output_dir: '[% c("var/projectname", { output_dir => "." }) %]/alpha'
|
|
| 109 | 109 | var:
|
| 110 | 110 | build_target: alpha
|
| 111 | 111 |
| ... | ... | @@ -51,13 +51,13 @@ setup_build_tools() { |
| 51 | 51 | download_unsigned_apks() {
|
| 52 | 52 | apks_dir=$(mktemp -d)
|
| 53 | 53 | trap "rm -Rf $apks_dir" EXIT
|
| 54 | - rsync -avH "$ssh_host_pkgstage:$pkgstage_tor_browser_build_dir/$tbb_version_type/signed/$tbb_version/*-qa.apk" "$apks_dir/"
|
|
| 54 | + rsync -avH "$ssh_host_pkgstage:$pkgstage_tor_browser_build_dir/$projectname/$tbb_version_type/signed/$tbb_version/*-qa.apk" "$apks_dir/"
|
|
| 55 | 55 | }
|
| 56 | 56 | |
| 57 | 57 | upload_signed_apks() {
|
| 58 | 58 | rsync -avH --exclude="*-qa.apk" --exclude="*-unaligned.apk" \
|
| 59 | 59 | --exclude="*-unsigned.apk" "$apks_dir/" \
|
| 60 | - "$ssh_host_pkgstage:$pkgstage_tor_browser_build_dir/$tbb_version_type/signed/$tbb_version/"
|
|
| 60 | + "$ssh_host_pkgstage:$pkgstage_tor_browser_build_dir/$projectname/$tbb_version_type/signed/$tbb_version/"
|
|
| 61 | 61 | }
|
| 62 | 62 | |
| 63 | 63 | # Sign individual apk
|
| 1 | 1 | . "$script_dir/set-config.tbb-version"
|
| 2 | 2 | . "$script_dir/set-config.hosts"
|
| 3 | 3 | |
| 4 | +projectname="torbrowser"
|
|
| 5 | + |
|
| 4 | 6 | bundle_locales="ALL"
|
| 5 | 7 | |
| 6 | -signed_dir="$script_dir/../../$tbb_version_type/signed"
|
|
| 8 | +signed_dir="$script_dir/../../$projectname/$tbb_version_type/signed"
|
|
| 7 | 9 | signed_version_dir="$signed_dir/$tbb_version"
|
| 8 | 10 | macos_stapled_dir="$signed_dir/$tbb_version-macos-stapled"
|
| 9 | 11 | macos_signed_dir="$signed_dir/$tbb_version-macos-signed"
|
| ... | ... | @@ -5,4 +5,4 @@ source "$script_dir/functions" |
| 5 | 5 | |
| 6 | 6 | var_is_defined ssh_host_builder builder_tor_browser_build_dir
|
| 7 | 7 | |
| 8 | -rsync $rsync_options "$signed_version_dir/" "$ssh_host_builder:$builder_tor_browser_build_dir/$tbb_version_type/signed/$tbb_version/" |
|
| 8 | +rsync $rsync_options "$signed_version_dir/" "$ssh_host_builder:$builder_tor_browser_build_dir/$projectname/$tbb_version_type/signed/$tbb_version/" |
| ... | ... | @@ -14,7 +14,7 @@ var_is_defined ssh_host_builder builder_tor_browser_build_dir |
| 14 | 14 | |
| 15 | 15 | while true
|
| 16 | 16 | do
|
| 17 | - ssh "$ssh_host_builder" test -f "$builder_tor_browser_build_dir/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/sha256sums-unsigned-build.incrementals.txt" && \
|
|
| 17 | + ssh "$ssh_host_builder" test -f "$builder_tor_browser_build_dir/$projectname/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/sha256sums-unsigned-build.incrementals.txt" && \
|
|
| 18 | 18 | exit 0
|
| 19 | 19 | echo "$(date -Iseconds): Waiting for build to finish..."
|
| 20 | 20 | sleep 5m
|