[tor-commits] [tor-browser-build/master] Add Windows Expert Bundle

[boklm at torproject.org]

commit 3f018465411dc2ad20f6087f1fdc863d116f1578
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Feb 16 22:33:07 2017 +0100

    Add Windows Expert Bundle
---
 projects/release/config |  8 ++++++++
 projects/tor/build      | 22 +++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/projects/release/config b/projects/release/config
index 0b3727f..febe801 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -103,6 +103,13 @@ input_files:
      - '[% c("var/build_target") %]'
      - torbrowser-osx-x86_64
 
+ - name: windows-expert-bundle
+   project: tor
+   enable: '[% c("var/torbrowser-windows-i686") %]'
+   target:
+     - '[% c("var/build_target") %]'
+     - torbrowser-windows-i686
+     - expert-bundle
 
 build: |
   #!/bin/sh
@@ -112,6 +119,7 @@ build: |
   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"/
diff --git a/projects/tor/build b/projects/tor/build
index 1f42add..f0b57f1 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -108,15 +108,23 @@ done
 
 mkdir -p [% dest_dir _ '/' _ c('filename') %]
 [%
-   IF c("var/osx");
-     SET tarsrcdir = [ 'Contents' ];
+   IF c("var/expert_bundle");
+     c('zip', {
+        zip_src => [ 'Data', 'Tor', ],
+        zip_args => dest_dir _ '/' _ c('filename') _ '/tor-win32-' _ c("version") _ '.zip',
+      });
    ELSE;
-     SET tarsrcdir = [ 'Data', 'Tor', ];
+     IF c("var/osx");
+       SET tarsrcdir = [ 'Contents' ];
+     ELSE;
+       SET tarsrcdir = [ 'Data', 'Tor', ];
+     END;
+     c('tar', {
+          tar_src => tarsrcdir,
+          tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor.tar.gz',
+      });
    END;
-   c('tar', {
-        tar_src => tarsrcdir,
-        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor.tar.gz',
-    }) %]
+%]
 
 [% IF c("var/linux") %]
 [% c('tar', {