commit 9d18c95bc22bb3df18c4839d21715ce7df9c1ee8 Author: Nicolas Vigier boklm@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