[tbb-commits] [tor-browser-build/master] Bug 20636: add Windows 64 to projects/release/config

[gk at torproject.org]

commit c00ea668caa435a6e7aa56fefc0470102df2fcbf
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Nov 6 13:21:04 2017 +0100

    Bug 20636: add Windows 64 to projects/release/config
---
 projects/release/build  |  4 ++++
 projects/release/config | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/projects/release/build b/projects/release/build
index db265c7..2be0c49 100644
--- a/projects/release/build
+++ b/projects/release/build
@@ -8,6 +8,10 @@ mkdir -p "$destdir"
   mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/
   mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/
 [% END -%]
+[% IF c("var/torbrowser-windows-x86_64") -%]
+  mv [% c('input_files_by_name/windows-x86_64') %]/* "$destdir"/
+  mv [% c('input_files_by_name/windows64-expert-bundle') %]/* "$destdir"/
+[% END -%]
 [% IF c("var/torbrowser-osx-x86_64") -%]
   mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/
 [% END -%]
diff --git a/projects/release/config b/projects/release/config
index 4ecbc0a..674ec80 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -12,6 +12,7 @@ targets:
     - torbrowser-linux-x86_64
     - torbrowser-linux-i686
     - torbrowser-windows-i686
+    - torbrowser-windows-x86_64
     - torbrowser-osx-x86_64
   torbrowser-linux-x86_64:
     var:
@@ -22,6 +23,9 @@ targets:
   torbrowser-windows-i686:
     var:
       torbrowser-windows-i686: 1
+  torbrowser-windows-x86_64:
+    var:
+      torbrowser-windows-x86_64: 1
   torbrowser-osx-x86_64:
     var:
       torbrowser-osx-x86_64: 1
@@ -96,6 +100,13 @@ input_files:
      - '[% c("var/build_target") %]'
      - torbrowser-windows-i686
 
+ - name: windows-x86_64
+   project: tor-browser
+   enable: '[% c("var/torbrowser-windows-x86_64") %]'
+   target:
+     - '[% c("var/build_target") %]'
+     - torbrowser-windows-x86_64
+
  - name: osx-x86_64
    project: tor-browser
    enable: '[% c("var/torbrowser-osx-x86_64") %]'
@@ -111,6 +122,14 @@ input_files:
      - torbrowser-windows-i686
      - expert-bundle
 
+ - name: windows64-expert-bundle
+   project: tor
+   enable: '[% c("var/torbrowser-windows-x86_64") %]'
+   target:
+     - '[% c("var/build_target") %]'
+     - torbrowser-windows-x86_64
+     - expert-bundle
+
 steps:
   signtag:
     build_log: '-'