Unverified Commit 5a89431f authored by boklm's avatar boklm
Browse files

Bug 20636: fix tor-browser bundle step for Windows 64

parent d0a79f2f
...@@ -270,7 +270,7 @@ cd $distdir ...@@ -270,7 +270,7 @@ cd $distdir
python $rootdir/pe_checksum_fix.py python $rootdir/pe_checksum_fix.py
mv torbrowser-install-tmp2.exe torbrowser-install.exe mv torbrowser-install-tmp2.exe torbrowser-install.exe
rm torbrowser-install-tmp.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 popd
[% END %] [% END %]
rm -rf $distdir/${PKG_DIR} rm -rf $distdir/${PKG_DIR}
...@@ -344,7 +344,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ ...@@ -344,7 +344,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
python $rootdir/pe_checksum_fix.py python $rootdir/pe_checksum_fix.py
mv torbrowser-install-tmp2.exe torbrowser-install.exe mv torbrowser-install-tmp2.exe torbrowser-install.exe
rm torbrowser-install-tmp.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 popd
[% END %] [% END %]
rm -rf [% tbdir %] rm -rf [% tbdir %]
......
...@@ -24,11 +24,20 @@ targets: ...@@ -24,11 +24,20 @@ targets:
- python - python
- bzip2 - bzip2
- faketime - faketime
windows-i686: windows:
var: var:
mar_osname: win32
arch_deps: arch_deps:
- python-pefile - 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: input_files:
- project: container-image - project: container-image
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment