[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40737: Prefix alpha/release/nightly directory with projectname
boklm (@boklm)
git at gitlab.torproject.org
Tue Jan 17 17:39:14 UTC 2023
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
Bug 40737: Prefix alpha/release/nightly directory with projectname
- - - - -
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:
=====================================
.gitignore
=====================================
@@ -2,9 +2,8 @@
/hg_clones
/gclient
/out
-/release
-/alpha
-/nightly
+/torbrowser
+/basebrowser
/testbuild
/rbm.local.conf
/logs
=====================================
Makefile
=====================================
@@ -187,39 +187,39 @@ signtag-alpha: submodule-update
$(rbm) build release --step signtag --target alpha
incrementals-release: submodule-update
- $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals
+ $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target torbrowser
tools/update-responses/download_missing_versions release
tools/update-responses/gen_incrementals release
- $(rbm) build release --step hash_incrementals --target release
+ $(rbm) build release --step hash_incrementals --target release --target torbrowser
incrementals-alpha: submodule-update
- $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals
+ $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser
tools/update-responses/download_missing_versions alpha
tools/update-responses/gen_incrementals alpha
- $(rbm) build release --step hash_incrementals --target alpha
+ $(rbm) build release --step hash_incrementals --target alpha --target torbrowser
incrementals-nightly: submodule-update
- $(rbm) build release --step update_responses_config --target nightly
+ $(rbm) build release --step update_responses_config --target nightly --target torbrowser
NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly
- $(rbm) build release --step hash_incrementals --target nightly
+ $(rbm) build release --step hash_incrementals --target nightly --target torbrowser
update_responses-release: submodule-update
- $(rbm) build release --step update_responses_config --target release --target signed
- $(rbm) build release --step create_update_responses_tar --target release --target signed
+ $(rbm) build release --step update_responses_config --target release --target signed --target torbrowser
+ $(rbm) build release --step create_update_responses_tar --target release --target signed --target torbrowser
update_responses-alpha: submodule-update
- $(rbm) build release --step update_responses_config --target alpha --target signed
- $(rbm) build release --step create_update_responses_tar --target alpha --target signed
+ $(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser
+ $(rbm) build release --step create_update_responses_tar --target alpha --target signed --target torbrowser
dmg2mar-release: submodule-update
- $(rbm) build release --step update_responses_config --target release --target signed
- $(rbm) build release --step dmg2mar --target release --target signed
+ $(rbm) build release --step update_responses_config --target release --target signed --target torbrowser
+ $(rbm) build release --step dmg2mar --target release --target signed --target torbrowser
tools/update-responses/download_missing_versions release
CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
dmg2mar-alpha: submodule-update
- $(rbm) build release --step update_responses_config --target alpha --target signed
- $(rbm) build release --step dmg2mar --target alpha --target signed
+ $(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser
+ $(rbm) build release --step dmg2mar --target alpha --target signed --target torbrowser
tools/update-responses/download_missing_versions alpha
CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
=====================================
README
=====================================
@@ -70,9 +70,10 @@ channel you want to build:
$ make torbrowser-alpha
$ make torbrowser-nightly
-You can find the build result in the directory release/unsigned/$version
-or alpha/unsigned/$version for release or alpha builds. The result of
-nightly can be found in the nightly/$version directory.
+You can find the build result in the directory
+torbrowser/release/unsigned/$version or torbrowser/alpha/unsigned/$version
+for release or alpha builds. The result of nightly can be found in the
+torbrowser/nightly/$version directory.
If you want to build for a specific platform only, append the platform
name to the makefile target:
=====================================
doc/MAKEFILE.txt
=====================================
@@ -5,7 +5,7 @@ Description of makefile rules
torbrowser-release
------------------
Build Tor Browser for the release channel, for all supported platforms.
-The resulting build can be found in directory release/$version.
+The resulting build can be found in directory torbrowser/release/$version.
torbrowser-release-{linux-x86_64,linux-i686,windows-i686,macos,
android-armv7, android-x86,android-x86_64,
@@ -18,7 +18,7 @@ android for all architectures we support.
torbrowser-alpha
----------------
Build Tor Browser for the alpha channel, for all supported platforms.
-The resulting build can be found in directory alpha/$version.
+The resulting build can be found in directory torbrowser/alpha/$version.
torbrowser-alpha-{linux-x86_64,linux-i686,windows-i686,macos,
android-armv7,android-x86,android-x86_64,
@@ -33,7 +33,7 @@ Many of the components will be based on the main branch. You might
want to run "make fetch" before, to fetch the latest commits from all
components.
-The resulting build can be found in directory nightly/$date
+The resulting build can be found in directory torbrowser/nightly/$date
torbrowser-nightly-{linux-x86_64,linux-i686,windows-i686,macos,
android-armv7,android-x86,android-x86_64,
=====================================
projects/release/config
=====================================
@@ -1,6 +1,6 @@
# vim: filetype=yaml sw=2
version: '[% c("var/torbrowser_version") %]'
-output_dir: release
+output_dir: '[% c("var/projectname", { output_dir => "." }) %]/release'
link_input_files: 1
var:
@@ -99,13 +99,13 @@ targets:
build_target: release
nightly:
- output_dir: 'nightly'
+ output_dir: '[% c("var/projectname", { output_dir => "." }) %]/nightly'
var:
build_target: nightly
publish_dir: '[% c("version") %]'
alpha:
- output_dir: alpha
+ output_dir: '[% c("var/projectname", { output_dir => "." }) %]/alpha'
var:
build_target: alpha
=====================================
tools/signing/android-signing
=====================================
@@ -51,13 +51,13 @@ setup_build_tools() {
download_unsigned_apks() {
apks_dir=$(mktemp -d)
trap "rm -Rf $apks_dir" EXIT
- rsync -avH "$ssh_host_pkgstage:$pkgstage_tor_browser_build_dir/$tbb_version_type/signed/$tbb_version/*-qa.apk" "$apks_dir/"
+ rsync -avH "$ssh_host_pkgstage:$pkgstage_tor_browser_build_dir/$projectname/$tbb_version_type/signed/$tbb_version/*-qa.apk" "$apks_dir/"
}
upload_signed_apks() {
rsync -avH --exclude="*-qa.apk" --exclude="*-unaligned.apk" \
--exclude="*-unsigned.apk" "$apks_dir/" \
- "$ssh_host_pkgstage:$pkgstage_tor_browser_build_dir/$tbb_version_type/signed/$tbb_version/"
+ "$ssh_host_pkgstage:$pkgstage_tor_browser_build_dir/$projectname/$tbb_version_type/signed/$tbb_version/"
}
# Sign individual apk
=====================================
tools/signing/set-config
=====================================
@@ -1,9 +1,11 @@
. "$script_dir/set-config.tbb-version"
. "$script_dir/set-config.hosts"
+projectname="torbrowser"
+
bundle_locales="ALL"
-signed_dir="$script_dir/../../$tbb_version_type/signed"
+signed_dir="$script_dir/../../$projectname/$tbb_version_type/signed"
signed_version_dir="$signed_dir/$tbb_version"
macos_stapled_dir="$signed_dir/$tbb_version-macos-stapled"
macos_signed_dir="$signed_dir/$tbb_version-macos-signed"
=====================================
tools/signing/sync-local-to-builder
=====================================
@@ -5,4 +5,4 @@ source "$script_dir/functions"
var_is_defined ssh_host_builder builder_tor_browser_build_dir
-rsync $rsync_options "$signed_version_dir/" "$ssh_host_builder:$builder_tor_browser_build_dir/$tbb_version_type/signed/$tbb_version/"
+rsync $rsync_options "$signed_version_dir/" "$ssh_host_builder:$builder_tor_browser_build_dir/$projectname/$tbb_version_type/signed/$tbb_version/"
=====================================
tools/signing/wait-for-finished-build
=====================================
@@ -14,7 +14,7 @@ var_is_defined ssh_host_builder builder_tor_browser_build_dir
while true
do
- 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" && \
+ 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" && \
exit 0
echo "$(date -Iseconds): Waiting for build to finish..."
sleep 5m
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/68767e581d199cc84a4452d26e14ae38c37c3e53
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/68767e581d199cc84a4452d26e14ae38c37c3e53
You're receiving this email because of your account on gitlab.torproject.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230117/83f3cb1e/attachment-0001.htm>
More information about the tor-commits
mailing list