commit 2ad1ddf890bc0362ffb1d6e72e9cb6ca652234c3 Author: Nicolas Vigier boklm@torproject.org Date: Thu Mar 19 21:09:02 2015 +0100
Add tor-mail and tor-messenger targets --- Makefile | 6 +++--- rbm.conf | 8 ++++++++ tools/clean-old | 11 +++++++---- 3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile index 5ffe4c1..b2472b7 100644 --- a/Makefile +++ b/Makefile @@ -3,13 +3,13 @@ rbm=./rbm/rbm all: submodule-update tor-messenger-linux-x86_64 tor-messenger-linux-i686 tor-messenger-windows-i686
tor-messenger-linux-x86_64: - $(rbm) build tor-messenger --target linux-x86_64 + $(rbm) build tor-messenger --target tor-messenger --target linux-x86_64
tor-messenger-linux-i686: - $(rbm) build tor-messenger --target linux-i686 + $(rbm) build tor-messenger --target tor-messenger --target linux-i686
tor-messenger-windows-i686: - $(rbm) build tor-messenger --target windows-i686 + $(rbm) build tor-messenger --target tor-messenger --target windows-i686
submodule-update: git submodule update --init diff --git a/rbm.conf b/rbm.conf index 0d385b4..d4bdf8f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -67,6 +67,14 @@ targets: osx: 1 osname: osx-x86_64
+ tor-messenger: + var: + tor-messenger: 1 + + tor-mail: + var: + tor-mail: 1 + # The no_build_id target can be useful if you want to quickly display # a build template or other option but don't want to spend time to # compute the various build ids diff --git a/tools/clean-old b/tools/clean-old index e3be7fa..a4de55f 100755 --- a/tools/clean-old +++ b/tools/clean-old @@ -6,6 +6,7 @@ use FindBin;
my $rbm = "$FindBin::Bin/../rbm/rbm"; my $projects_dir = "$FindBin::Bin/../projects"; +my $product_target = 'tor-messenger'; my @targets = qw(linux-x86_64 linux-i686 windows-i686 osx-x86_64); my @sig_ext = qw(.sig .gpg .asc); my $docker_image_prefix = docker_image_prefix(); @@ -19,12 +20,14 @@ sub clean_project_build_files { my %keep_files; foreach my $target (@targets) { my ($out, $err, $success) = capture_exec($rbm, - 'showconf', $project, 'filename', "--target=$target"); + 'showconf', $project, 'filename', "--target=$product_target", + "--target=$target"); return unless $success; chomp $out; $keep_files{$out} = 1; ($out, $err, $success) = capture_exec($rbm, - 'showconf', $project, 'var/input_files_list', "--target=$target"); + 'showconf', $project, 'var/input_files_list', + "--target=$product_target", "--target=$target"); next unless $success; my @input_files = split("\n", $out); foreach my $input_file (@input_files) { @@ -84,12 +87,12 @@ sub clean_docker_images { next unless -f "$project/config"; foreach my $target (@targets) { my ($out, $err, $success) = capture_exec($rbm, 'showconf', $project, - 'remote_docker', "--target=$target"); + 'remote_docker', "--target=$product_target", "--target=$target"); next unless $success; chomp $out; next unless $out; ($out, $err, $success) = capture_exec($rbm, 'showconf', $project, - 'docker_image', "--target=$target"); + 'docker_image', "--target=$product_target", "--target=$target"); next unless $success; chomp $out; my (undef, $image_file) = split(':', $out);