Commit 0abccfe4 authored by boklm's avatar boklm Committed by Georg Koppen
Browse files

Bug 24477: Fix generation of Windows 64 mar files

parent 9d501237
...@@ -43,6 +43,11 @@ mkdir -p $TBDIR/$MEEKPROFILEPATH/extensions ...@@ -43,6 +43,11 @@ mkdir -p $TBDIR/$MEEKPROFILEPATH/extensions
# Extract the MAR tools. # Extract the MAR tools.
unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip
MARTOOLS=$rootdir/mar-tools MARTOOLS=$rootdir/mar-tools
[% IF c("var/windows-x86_64") -%]
# Workaround for bug 24477
rm -Rf $MARTOOLS
unzip -d $rootdir $rootdir/mar-tools-linux32.zip
[% END -%]
mv [% c('input_files_by_name/tor-launcher') %] $TBDIR/$EXTSPATH/tor-launcher@torproject.org.xpi mv [% c('input_files_by_name/tor-launcher') %] $TBDIR/$EXTSPATH/tor-launcher@torproject.org.xpi
mv [% c('input_files_by_name/torbutton') %] $TBDIR/$EXTSPATH/torbutton@torproject.org.xpi mv [% c('input_files_by_name/torbutton') %] $TBDIR/$EXTSPATH/torbutton@torproject.org.xpi
......
...@@ -85,3 +85,9 @@ input_files: ...@@ -85,3 +85,9 @@ input_files:
enable: '[% c("var/windows") %]' enable: '[% c("var/windows") %]'
- filename: pe_checksum_fix.py - filename: pe_checksum_fix.py
enable: '[% c("var/windows") %]' enable: '[% c("var/windows") %]'
# Workaround for bug 24477
- URL: https://archive.torproject.org/tor-package-archive/torbrowser/7.5a7/mar-tools-linux32.zip
sig_ext: asc
file_gpg_id: 1
gpg_keyring: torbrowser.gpg
enable: '[% c("var/windows-x86_64") %]'
Markdown is supported
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