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
660007aa
Commit
660007aa
authored
Jun 29, 2018
by
Georg Koppen
Browse files
Merge remote-tracking branch 'boklm/bug_26410'
parents
c2f11e37
2846221a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
660007aa
...
...
@@ -119,7 +119,7 @@ incrementals-release: submodule-update
incrementals-alpha
:
submodule-update
$(rbm)
build release
--step
update_responses_config
--target
alpha
--target
create_unsigned_incrementals
tools/update-responses/download_missing_versions alpha
MAR_OLD_FORMAT
=
1
tools/update-responses/gen_incrementals alpha
tools/update-responses/gen_incrementals alpha
$(rbm)
build release
--step
hash_incrementals
--target
alpha
update_responses-release
:
submodule-update
...
...
@@ -138,9 +138,9 @@ dmg2mar-release: submodule-update
dmg2mar-alpha
:
submodule-update
$(rbm)
build release
--step
update_responses_config
--target
alpha
--target
signed
MAR_OLD_FORMAT
=
1
$(rbm)
build release
--step
dmg2mar
--target
alpha
--target
signed
$(rbm)
build release
--step
dmg2mar
--target
alpha
--target
signed
tools/update-responses/download_missing_versions alpha
CHECK_CODESIGNATURE_EXISTS
=
1
MAR_SKIP_EXISTING
=
1
MAR_OLD_FORMAT
=
1
tools/update-responses/gen_incrementals alpha
CHECK_CODESIGNATURE_EXISTS
=
1
MAR_SKIP_EXISTING
=
1 tools/update-responses/gen_incrementals alpha
submodule-update
:
git submodule update
--init
...
...
projects/tor-browser/build
View file @
660007aa
...
...
@@ -264,9 +264,11 @@ popd
cd
$
distdir
[
%
IF
c
(
"var/build_mar"
)
-%
]
# Let's use the bzip2 format for now so that users can update to the first
# esr60-based Tor Browser.
export
MAR_OLD_FORMAT
=
1
[
%
IF
c
(
"var/release"
)
-%
]
# Let's use the bzip2 format for now so that users can update to the first
# esr60-based Tor Browser.
export
MAR_OLD_FORMAT
=
1
[
%
END
-%
]
# Create full MAR file and compressed package.
MAR_FILE
=
tor
-
browser
-
[
%
c
(
"var/mar_osname"
)
%
]
-
[
%
c
(
"var/torbrowser_version"
)
%
]
_
$
{
PKG_LOCALE
}.
mar
MAR
=
$
MARTOOLS
/
mar
MBSDIFF
=
$
MARTOOLS
/
mbsdiff
$
MARTOOLS
/
make_full_update
.
sh
-
q
$
OUTDIR
/
$
MAR_FILE
"$TBDIR"
...
...
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