Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tor-browser-build
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Applications
tor-browser-build
Commits
fbc42f7e
Commit
fbc42f7e
authored
Feb 22, 2023
by
Pier Angelo Vendrame
Committed by
Richard Pospesel
Apr 4, 2023
Browse files
Options
Downloads
Patches
Plain Diff
MB 49: Include the copyright string in the app bundle
parent
533d53c2
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!697
Bug 40837: Rebase mullvad-browser build changes onto main
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
projects/firefox/build
+6
-3
6 additions, 3 deletions
projects/firefox/build
projects/firefox/fix-info-plist.py
+20
-12
20 additions, 12 deletions
projects/firefox/fix-info-plist.py
with
26 additions
and
15 deletions
projects/firefox/build
+
6
−
3
View file @
fbc42f7e
...
...
@@ -195,9 +195,12 @@ export LANG=C.UTF-8
# Adjust the Info.plist file
INFO_PLIST
=
"
$distdir/[% c(
'
var/Project_Name
'
) %].app/Contents/Info.plist
"
mv
"
$INFO_PLIST
"
tmp
.
plist
python3
$
rootdir
/
fix
-
info
-
plist
.
py
'
[% c(
"
var/torbrowser_version
"
) %]
'
'
[% c(
"
var/copyright_year
"
) %]
'
<
tmp
.
plist
>
"
$INFO_PLIST
"
rm
-
f
tmp
.
plist
python3
$
rootdir
/
fix
-
info
-
plist
.
py
\
"
$INFO_PLIST
"
\
'
[% c(
"
var/Project_Name
"
) %]
'
\
'
[% c(
"
var/torbrowser_version
"
) %]
'
\
'
[% c(
"
var/copyright_year
"
) %]
'
\
[
%
IF
c
(
"
var/privacy-browser
"
)
-%
]
'
Mullvad, Tor Browser and Mozilla Developers
'
[
%
ELSE
-%
]
'
The Tor Project
'
[
%
END
%
]
[
%
END
%
]
[
%
IF
c
(
"
var/linux
"
)
%
]
...
...
This diff is collapsed.
Click to expand it.
projects/firefox/fix-info-plist.py
+
20
−
12
View file @
fbc42f7e
...
...
@@ -9,26 +9,34 @@ import getopt
import
plistlib
import
sys
def
usage
():
print
(
"
usage: %s TORBROWSER_VERSION YEAR < Info.plist > FixedInfo.plist
"
%
sys
.
argv
[
0
],
file
=
sys
.
stderr
)
print
(
f
"
Usage:
{
sys
.
argv
[
0
]
}
plist-file product-name version year copyright-holder
"
,
file
=
sys
.
stderr
,
)
sys
.
exit
(
2
)
_
,
args
=
getopt
.
gnu_getopt
(
sys
.
argv
[
1
:],
""
)
if
len
(
args
)
!=
2
:
if
len
(
args
)
!=
5
:
usage
()
TORBROWSER_VERSION
=
args
[
0
]
YEAR
=
args
[
1
]
fname
=
args
[
0
]
product
=
args
[
1
]
version
=
args
[
2
]
year
=
args
[
3
]
holder
=
args
[
4
]
COPYRIGHT
=
"
Tor Browser %s Copyright %s The Tor Project
"
%
(
TORBROWSER_VERSION
,
YEAR
)
copyright
=
f
"
{
product
}
{
version
}
Copyright
{
year
}
{
holder
}
"
sys
.
stdin
=
open
(
sys
.
stdin
.
fileno
()
,
'
rb
'
)
plist
=
plistlib
.
load
(
sys
.
stdin
)
with
open
(
fname
,
"
rb
"
)
as
f
:
plist
=
plistlib
.
load
(
f
)
plist
[
"
CFBundleGetInfoString
"
]
=
"
Tor Browser %s
"
%
TORBROWSER_VERSION
plist
[
"
CFBundleShortVersionString
"
]
=
TORBROWSER_VERSION
plist
[
"
NSHumanReadableCopyright
"
]
=
COPYRIGHT
plist
[
"
CFBundleGetInfoString
"
]
=
f
"
{
product
}
{
version
}
"
plist
[
"
CFBundleShortVersionString
"
]
=
version
plist
[
"
NSHumanReadableCopyright
"
]
=
copyright
sys
.
stdout
=
open
(
sys
.
stdout
.
fileno
()
,
'
wb
'
)
plistlib
.
dump
(
plist
,
sys
.
stdout
)
with
open
(
fname
,
"
wb
"
)
as
f
:
plistlib
.
dump
(
plist
,
f
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment