Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Matthew Finkel
tor-browser-build
Commits
5a89431f
Unverified
Commit
5a89431f
authored
Nov 06, 2017
by
boklm
Browse files
Bug 20636: fix tor-browser bundle step for Windows 64
parent
d0a79f2f
Changes
2
Hide whitespace changes
Inline
Side-by-side
projects/tor-browser/build
View file @
5a89431f
...
...
@@ -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
%
]
...
...
projects/tor-browser/config
View file @
5a89431f
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment