- tbb-commits - lists.torproject.org

[tor-browser-build/master] Fix a typo introduced in c87cfc7291c7faf95c7afc8af693a7f689cdcc0a
by boklm＠torproject.org 08 Aug '17

08 Aug '17

commit d8de49152e01a1b6cf4b0801bd1e3b3f42f0e857 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 02:49:59 2017 +0200 Fix a typo introduced in c87cfc7291c7faf95c7afc8af693a7f689cdcc0a --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 9dbe709..db265c7 100644 --- a/projects/release/build +++ b/projects/release/build @@ -7,7 +7,7 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ -% END -%] +[% END -%] [% IF c("var/torbrowser-osx-x86_64") -%] mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ [% END -%]

1 0

[tor-browser-build/master] Fix .gitignore syntax
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 15435cbc400074d2a415cb3e8b14bdb7bd0fb653 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 23:59:22 2017 +0200 Fix .gitignore syntax Add a leading slash on all lines to match files/directories only in the root directory. --- .gitignore | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 0fe0aec..7c83e82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ -git_clones -hg_clones -gclient -out -release -alpha -alpha_nightly -nightly -hardened -testbuild -rbm.local.conf -logs +/git_clones +/hg_clones +/gclient +/out +/release +/alpha +/alpha_nightly +/nightly +/hardened +/testbuild +/rbm.local.conf +/logs

1 0

[tor-browser-build/master] Add script to help tagging a release
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 5a438172202b385f962f3b715efff2b20be859f8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 00:37:15 2017 +0200 Add script to help tagging a release The 'make signtag-release' and 'make signtag-alpha' commands can be used to tag a stable or alpha release using the version informations from rbm.conf. --- Makefile | 6 ++++++ projects/release/config | 6 ++++++ projects/release/signtag | 8 ++++++++ rbm | 2 +- rbm.conf | 1 + rbm.local.conf.example | 5 +++++ 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b82309c..274e11c 100644 --- a/Makefile +++ b/Makefile @@ -80,6 +80,12 @@ testbuild-osx-x86_64: submodule-update hardened-linux-x86_64: submodule-update $(rbm) build release --target hardened --target torbrowser-linux-x86_64 +signtag-release: submodule-update + $(rbm) build release --step signtag --target release + +signtag-alpha: submodule-update + $(rbm) build release --step signtag --target alpha + submodule-update: git submodule update --init diff --git a/projects/release/config b/projects/release/config index 8beea7e..db62a95 100644 --- a/projects/release/config +++ b/projects/release/config @@ -117,3 +117,9 @@ input_files: - torbrowser-windows-i686 - expert-bundle +steps: + signtag: + build_log: '-' + debug: 0 + input_files: [] + signtag: '[% INCLUDE signtag %]' diff --git a/projects/release/signtag b/projects/release/signtag new file mode 100644 index 0000000..3ce2e48 --- /dev/null +++ b/projects/release/signtag @@ -0,0 +1,8 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +# reset HOME which was changed by var/set_default_env, for gpg/git +[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] +cd [% c("basedir") %] +git tag [% c("buildconf/git_signtag_opt") %] -m \ + 'Tagging [% c("var/torbrowser_build") %] for [% c("var/torbrowser_version") %]' \ + tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %] diff --git a/rbm b/rbm index ff4299f..31be478 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit ff4299fcf372aef5d28fe7024a60d81d413fcd6f +Subproject commit 31be478688e0448d36373d21939922f2a108aeea diff --git a/rbm.conf b/rbm.conf index 13d19a5..6745cdc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -11,6 +11,7 @@ pkg_type: build # in var/build_id, so that changing this option does not affect the build_id. buildconf: num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]' + git_signtag_opt: '-s' var: torbrowser_version: '7.5a4' diff --git a/rbm.local.conf.example b/rbm.local.conf.example index a4b0212..e30d8a8 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -29,6 +29,11 @@ buildconf: ### RBM_NUM_PROCS environment variable. The default is 4. #num_procs: 8 + ### The buildconf/git_signtag_opt option is useful when you tag a release. + ### It is used to set the 'git tag' argument to select the keyid for + ### signing the tag. + #git_signtag_opt: '-u keyid' + var: local_conf: 1

1 0

[tor-browser-build/master] Move projects/release/config build to a separate file
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit c87cfc7291c7faf95c7afc8af693a7f689cdcc0a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 00:04:18 2017 +0200 Move projects/release/config build to a separate file --- projects/release/build | 26 ++++++++++++++++++++++++++ projects/release/config | 27 --------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/projects/release/build b/projects/release/build new file mode 100644 index 0000000..9dbe709 --- /dev/null +++ b/projects/release/build @@ -0,0 +1,26 @@ +#!/bin/sh +[% c("var/set_default_env") -%] +# reset HOME which was changed by var/set_default_env, for gpg +[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] +destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" +mkdir -p "$destdir" +[% IF c("var/torbrowser-windows-i686") -%] + mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ + mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ +% END -%] +[% IF c("var/torbrowser-osx-x86_64") -%] + mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ +[% END -%] +[% IF c("var/torbrowser-linux-i686") -%] + mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ +[% END -%] +[% IF c("var/torbrowser-linux-x86_64") -%] + mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ + mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip +[% END -%] +cd "$destdir" +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +[% IF c("var/sign_build") -%] + gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt +[% END -%] +cat sha256sums-unsigned-build.txt diff --git a/projects/release/config b/projects/release/config index 43a36e8..8beea7e 100644 --- a/projects/release/config +++ b/projects/release/config @@ -117,30 +117,3 @@ input_files: - torbrowser-windows-i686 - expert-bundle -build: | - #!/bin/sh - [% c("var/set_default_env") -%] - # reset HOME which was changed by var/set_default_env, for gpg - [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] - destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" - mkdir -p "$destdir" - [% IF c("var/torbrowser-windows-i686") -%] - mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ - mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ - [% END -%] - [% IF c("var/torbrowser-osx-x86_64") -%] - mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ - [% END -%] - [% IF c("var/torbrowser-linux-i686") -%] - mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ - [% END -%] - [% IF c("var/torbrowser-linux-x86_64") -%] - mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ - mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip - [% END -%] - cd "$destdir" - sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt - [% IF c("var/sign_build") -%] - gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt - [% END -%] - cat sha256sums-unsigned-build.txt

1 0

[rbm/master] Add a man page for rbm-build
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 0732a77db13fa713b481877593cb8f4d005560c2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 23:14:37 2017 +0200 Add a man page for rbm-build --- doc/Makefile | 1 + doc/documentation.asc | 1 + doc/rbm-build.asc | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/doc/Makefile b/doc/Makefile index c3c8f11..593ecba 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -35,6 +35,7 @@ MAN1_ASC += rbm-deb-src.asc MAN1_ASC += rbm-deb.asc MAN1_ASC += rbm-pkg.asc MAN1_ASC += rbm-publish.asc +MAN1_ASC += rbm-build.asc MAN7_ASC += rbm_tutorial.asc MAN7_ASC += rbm_layout.asc diff --git a/doc/documentation.asc b/doc/documentation.asc index 492ad47..82b5e62 100644 --- a/doc/documentation.asc +++ b/doc/documentation.asc @@ -14,6 +14,7 @@ rbm commands : - link:rbm-usage.html[rbm-usage(1)] - link:rbm-tar.html[rbm-tar(1)] - link:rbm-showconf.html[rbm-showconf(1)] +- link:rbm-build.html[rbm-build(1)] - link:rbm-srpm.html[rbm-srpm(1)] - link:rbm-rpm.html[rbm-rpm(1)] - link:rbm-rpmspec.html[rbm-rpmspec(1)] diff --git a/doc/rbm-build.asc b/doc/rbm-build.asc new file mode 100644 index 0000000..042ab41 --- /dev/null +++ b/doc/rbm-build.asc @@ -0,0 +1,34 @@ +rbm-build(1) +============ + +NAME +---- +rbm-build - Build a package + + +SYNOPSIS +-------- +[verse] +'rbm build' <project> [options] + +DESCRIPTION +----------- + +Build a package for the selected project. + +CONFIGURATION OPTIONS +--------------------- + +The +build+ option is used as the build script. The default value of +the +build+ option is '[% INCLUDE build -%]' which means that you can +create the build script as a +build+ file in the project's directory. + +See link:rbm_config.html[rbm_config(7)] for all other options. + +COMMAND LINE OPTIONS +-------------------- +See link:rbm_cli.html[rbm_cli(7)]. + +SEE ALSO +-------- +link:rbm.html[rbm(1)]

1 0

[rbm/master] rbm-build: allow selecting the build script using the step option
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 31be478688e0448d36373d21939922f2a108aeea Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 23:44:06 2017 +0200 rbm-build: allow selecting the build script using the step option --- doc/rbm-build.asc | 16 ++++++++++++---- doc/rbm-deb-src.asc | 2 ++ doc/rbm-deb.asc | 2 ++ doc/rbm-rpm.asc | 2 ++ doc/rbm-srpm.asc | 2 ++ doc/rbm_cli.asc | 5 +++-- lib/RBM.pm | 2 +- rbm | 1 + test.pl | 2 +- 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/doc/rbm-build.asc b/doc/rbm-build.asc index 042ab41..e7a2666 100644 --- a/doc/rbm-build.asc +++ b/doc/rbm-build.asc @@ -19,16 +19,24 @@ Build a package for the selected project. CONFIGURATION OPTIONS --------------------- -The +build+ option is used as the build script. The default value of -the +build+ option is '[% INCLUDE build -%]' which means that you can -create the build script as a +build+ file in the project's directory. +When no +step+ was selected in the command line options, the +build+ +option is used as the build script. The default value of the +build+ +option is '[% INCLUDE build -%]' which means that you can create the +build script as a +build+ file in the project's directory. + +If a +step+ is selected in the command line options, an option of the +same name is used as the build script. See link:rbm_config.html[rbm_config(7)] for all other options. COMMAND LINE OPTIONS -------------------- -See link:rbm_cli.html[rbm_cli(7)]. + +The --step=<step> option can be used to select the build script to run. + +See link:rbm_cli.html[rbm_cli(7)] for the other command line options. SEE ALSO -------- link:rbm.html[rbm(1)] +link:rbm_steps.html[rbm_steps(7)] diff --git a/doc/rbm-deb-src.asc b/doc/rbm-deb-src.asc index 07c8f39..d0212ea 100644 --- a/doc/rbm-deb-src.asc +++ b/doc/rbm-deb-src.asc @@ -16,6 +16,8 @@ DESCRIPTION Create a debian source package for the selected project. +This is equivalent to running 'rbm build --step deb_src <project>'. + CONFIGURATION OPTIONS --------------------- diff --git a/doc/rbm-deb.asc b/doc/rbm-deb.asc index 4f0562e..0544b89 100644 --- a/doc/rbm-deb.asc +++ b/doc/rbm-deb.asc @@ -16,6 +16,8 @@ DESCRIPTION Build a debian package. +This is equivalent to running 'rbm build --step deb <project>'. + CONFIGURATION OPTIONS --------------------- diff --git a/doc/rbm-rpm.asc b/doc/rbm-rpm.asc index 1edc118..75f1886 100644 --- a/doc/rbm-rpm.asc +++ b/doc/rbm-rpm.asc @@ -16,6 +16,8 @@ DESCRIPTION Build an rpm package for the selected project. +This is equivalent to running 'rbm build --step rpm <project>'. + CONFIGURATION OPTIONS --------------------- diff --git a/doc/rbm-srpm.asc b/doc/rbm-srpm.asc index 9fe40fb..bc2a28c 100644 --- a/doc/rbm-srpm.asc +++ b/doc/rbm-srpm.asc @@ -16,6 +16,8 @@ DESCRIPTION Create a source rpm package for the select project. +This is equivalent to running 'rbm build --step srpm <project>'. + CONFIGURATION OPTIONS --------------------- diff --git a/doc/rbm_cli.asc b/doc/rbm_cli.asc index adb8b27..0e6828c 100644 --- a/doc/rbm_cli.asc +++ b/doc/rbm_cli.asc @@ -65,8 +65,9 @@ The following options can be set on the command line : directory in case of build failure. --step:: - This sets the current step. This is only meaningful with the - showconf command. + This sets the current step when using the showconf command. When + using the build command this is used to select the step (and build + script of the same name) to start. include::clioptions_tar.asc[] diff --git a/lib/RBM.pm b/lib/RBM.pm index 888c3e1..100bc04 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -46,7 +46,7 @@ sub load_config { $config = load_config_file($config_file); $config->{default} = \%default_config; $config->{basedir} = dirname($config_file); - $config->{step} = 'init'; + $config->{step} = 'rbm_init'; $config->{opt} = {}; my $pdir = $config->{projects_dir} || $config->{default}{projects_dir}; foreach my $p (glob path($pdir) . '/*') { diff --git a/rbm b/rbm index 9a8ccf2..2c4ad0d 100755 --- a/rbm +++ b/rbm @@ -173,6 +173,7 @@ sub build_script { my $cmd = shift; my $args = set_options(@_); usageexit($cmd) unless @$args == 1; + $script_name = $RBM::config->{step} if $RBM::config->{step} ne 'rbm_init'; RBM::build_pkg($args->[0], { pkg_type => $script_name }); } diff --git a/test.pl b/test.pl index 2748614..8e842e7 100755 --- a/test.pl +++ b/test.pl @@ -196,7 +196,7 @@ my @tests = ( foreach my $test (@tests) { set_target($test->{target} ? @{$test->{target}} : ()); - set_step($test->{step} ? $test->{step} : 'init'); + set_step($test->{step} ? $test->{step} : 'rbm_init'); if ($test->{config}) { is( RBM::project_config(@{$test->{config}}),

1 0

[rbm/master] Update some URLs in documentation
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 04bef8756754fae67419b13ce7c1e2a081972c62 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 22:46:44 2017 +0200 Update some URLs in documentation --- README.md | 2 +- doc/index.asc | 9 +++++---- doc/rbm.asc | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d7d0e1d..3b6862d 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,5 @@ to allow reproducing the build. For more information, visit the website : - http://rbm.boklm.eu/ + https://people.torproject.org/~boklm/rbm/ diff --git a/doc/index.asc b/doc/index.asc index 0a2ed92..735c246 100644 --- a/doc/index.asc +++ b/doc/index.asc @@ -26,16 +26,17 @@ include::documentation.asc[] Download and installation ------------------------- -The sources are available https://github.com/boklm/rbm[on github]. +The sources are available on https://gitweb.torproject.org/builders/rbm.git/. -Packages will soon be available for various distributions. +The recommanded way to use rbm to build your project is to use it as a +git submodule so you can pick the commit to use. Examples -------- -An example of package templates and configuration is available in -https://github.com/boklm/burps-workspace[this git repository]. +You can look at the https://gitweb.torproject.org/builders/tor-browser-build.git/[Tor Browser build repository] +for an example of how it can be used. License diff --git a/doc/rbm.asc b/doc/rbm.asc index 50df8f4..4c6a0a6 100644 --- a/doc/rbm.asc +++ b/doc/rbm.asc @@ -31,7 +31,7 @@ include::documentation.asc[] EXAMPLES -------- -Some examples of package templates and configuration are available in -the git repository at the following address : -https://github.com/boklm/burps-workspace +You can look at the Tor Browser build repository for an example of how +it can be used. +https://gitweb.torproject.org/builders/tor-browser-build.git/

1 0

[tor-browser-build/master] Add a torbrowser_build option and use it in the build output directory
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 9d18c95bc22bb3df18c4839d21715ce7df9c1ee8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 19:47:53 2017 +0200 Add a torbrowser_build option and use it in the build output directory --- projects/release/config | 10 +++++----- rbm.conf | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/release/config b/projects/release/config index 3351959..43a36e8 100644 --- a/projects/release/config +++ b/projects/release/config @@ -4,7 +4,7 @@ output_dir: 'release/unsigned' var: today: '[% USE date; date.format(format = "%Y-%m-%d") %]' - publish_dir: '[% c("version") %]' + publish_dir: '[% c("version") %]-[% c("var/torbrowser_build") %]' targets: torbrowser-all: @@ -39,13 +39,13 @@ targets: nightly: output_dir: 'nightly' - version: '[% c("var/today") %]' + publish_dir: '[% c("var/today") %]' var: build_target: nightly alpha_nightly: output_dir: 'alpha_nightly' - version: '[% c("var/today") %]' + publish_dir: '[% c("var/today") %]' var: build_target: alpha @@ -56,13 +56,13 @@ targets: testbuild: output_dir: 'testbuild' - version: '.' + publish_dir: '' var: build_target: torbrowser-testbuild hardened_nightly: output_dir: 'hardened_nightly' - version: '[% c("var/today") %]' + publish_dir: '[% c("var/today") %]' var: build_target: hardened diff --git a/rbm.conf b/rbm.conf index 46d487c..13d19a5 100644 --- a/rbm.conf +++ b/rbm.conf @@ -14,6 +14,7 @@ buildconf: var: torbrowser_version: '7.5a4' + torbrowser_build: 'build1' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Refresh keyring/firefox.gpg
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 5ef1e3f8014542af7409ad973601b73a15acf119 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 17:17:08 2017 +0200 Refresh keyring/firefox.gpg --- keyring/firefox.gpg | Bin 11220 -> 13463 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/firefox.gpg b/keyring/firefox.gpg index fa6d1b5..9c71261 100644 Binary files a/keyring/firefox.gpg and b/keyring/firefox.gpg differ

1 0

[tor-browser-build/master] Fix firefox tag
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 974f99fdd011255fea5e063396940893b1f40146 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 16:50:21 2017 +0200 Fix firefox tag --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 30f89d6..e2cf727 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg

1 0