[tor-commits] [tor-browser-build/master] Bug 17381: create tar containing update responses xml files

[boklm at torproject.org]

commit 93bb526421830f185c431d9064043e54c38d6bab
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Aug 21 19:01:16 2017 +0200

    Bug 17381: create tar containing update responses xml files
    
    Create a tar file in directory {alpha,release}/update-responses/, to
    make it a little easier to copy them to the host where they will be
    deployed.
---
 Makefile                                     | 4 ++--
 README.MAKEFILE                              | 3 ++-
 projects/release/config                      | 5 +++++
 projects/release/create_update_responses_tar | 9 +++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1229cfa..ce63e54 100644
--- a/Makefile
+++ b/Makefile
@@ -97,11 +97,11 @@ incrementals-alpha: submodule-update
 
 update_responses-release: submodule-update
 	$(rbm) build release --step update_responses_config --target release --target signed
-	tools/update-responses/update_responses release
+	$(rbm) build release --step create_update_responses_tar --target release --target signed
 
 update_responses-alpha: submodule-update
 	$(rbm) build release --step update_responses_config --target alpha --target signed
-	tools/update-responses/update_responses alpha
+	$(rbm) build release --step create_update_responses_tar --target alpha --target signed
 
 dmg2mar-release: submodule-update
 	$(rbm) build release --step update_responses_config --target release --target signed
diff --git a/README.MAKEFILE b/README.MAKEFILE
index 9e28864..cd4bf2f 100644
--- a/README.MAKEFILE
+++ b/README.MAKEFILE
@@ -91,5 +91,6 @@ signing the OSX dmg files.
 update_responses-{release,alpha}
 --------------------------------
 Create update responses xml files for a signed build in the release or
-alpha channel.
+alpha channel. The files can be found in a tar in the directory
+{release,alpha}/update-responses.
 
diff --git a/projects/release/config b/projects/release/config
index 0a4276a..4ecbc0a 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -122,6 +122,11 @@ steps:
     debug: 0
     input_files: []
     update_responses_config: '[% INCLUDE update_responses_config %]'
+  create_update_responses_tar:
+    build_log: '-'
+    debug: 0
+    input_files: []
+    create_update_responses_tar: '[% INCLUDE create_update_responses_tar %]'
   hash_incrementals:
     build_log: '-'
     debug: 0
diff --git a/projects/release/create_update_responses_tar b/projects/release/create_update_responses_tar
new file mode 100644
index 0000000..ee1180f
--- /dev/null
+++ b/projects/release/create_update_responses_tar
@@ -0,0 +1,9 @@
+#!/bin/bash
+[% c("var/set_default_env") -%]
+[% shell_quote(c("basedir")) %]/tools/update-responses/update_responses
+mkdir -p [% shell_quote(path(dest_dir)) %]/update-responses
+[% SET channel = pc('firefox', 'var/torbrowser_update_channel') -%]
+mv [% shell_quote(c("basedir")) %]/tools/update-responses/htdocs/[% channel %] [% channel %]
+chmod 775 [% channel %]
+chmod 664 [% channel %]/.htaccess [% channel %]/*
+tar cf [% shell_quote(path(dest_dir)) %]/update-responses/update-responses-[% channel %]-[%  c("version") %].tar [% channel %]