commit 5a89431f10be74e1f08cdd804d24999ffd899426 Author: Nicolas Vigier boklm@torproject.org Date: Mon Nov 6 13:01:25 2017 +0100

Bug 20636: fix tor-browser bundle step for Windows 64 --- projects/tor-browser/build | 4 ++-- projects/tor-browser/config | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 6540245..f9740f7 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -270,7 +270,7 @@ cd $distdir python $rootdir/pe_checksum_fix.py mv torbrowser-install-tmp2.exe torbrowser-install.exe rm torbrowser-install-tmp.exe - mv torbrowser-install.exe $OUTDIR/torbrowser-install-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.exe + mv torbrowser-install.exe $OUTDIR/torbrowser-install[% IF c("var/windows-x86_64") %]-win64[% END %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.exe popd [% END %] rm -rf $distdir/${PKG_DIR} @@ -344,7 +344,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ python $rootdir/pe_checksum_fix.py mv torbrowser-install-tmp2.exe torbrowser-install.exe rm torbrowser-install-tmp.exe - mv torbrowser-install.exe $OUTDIR/torbrowser-install-[% c("var/torbrowser_version") %]_[% lang %].exe + mv torbrowser-install.exe $OUTDIR/torbrowser-install[% IF c("var/windows-x86_64") %]-win64[% END %]-[% c("var/torbrowser_version") %]_[% lang %].exe popd [% END %] rm -rf [% tbdir %] diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 54a0e9e..6b7559a 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -24,11 +24,20 @@ targets: - python - bzip2 - faketime - windows-i686: + windows: var: - mar_osname: win32 arch_deps: - python-pefile + windows-i686: + var: + mar_osname: win32 + windows-x86_64: + var: + mar_osname: win64 + # We use a 32bit container to be able to use a 32bit nsis and + # pe_checksum_fix.py + container: + arch: i386

input_files: - project: container-image