Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
a82df901
by Pier Angelo Vendrame at 2024-07-09T18:23:49+02:00
2 changed files:
Changes:
... | ... | @@ -10,7 +10,7 @@ etc ...). You will need to install the uidmap package, providing the |
10 | 10 | newuidmap and newgidmap commands.
|
11 | 11 | |
12 | 12 | The sources of most components are downloaded using git, which needs to
|
13 | -be installed. The mercurial package is also needed.
|
|
13 | +be installed.
|
|
14 | 14 | |
15 | 15 | Zstandard (zstd) is used to compress some tarballs and needs to be
|
16 | 16 | installed. You'll also need tar >= 1.31, for zstd support.
|
... | ... | @@ -46,7 +46,7 @@ If you are running Debian or Ubuntu, you can install them with: |
46 | 46 | libparallel-forkmanager-perl libpath-tiny-perl \
|
47 | 47 | libsort-versions-perl libstring-shellquote-perl \
|
48 | 48 | libtemplate-perl libxml-libxml-perl libxml-writer-perl \
|
49 | - libyaml-libyaml-perl git mercurial uidmap zstd
|
|
49 | + libyaml-libyaml-perl git uidmap zstd
|
|
50 | 50 | |
51 | 51 | If you are running Fedora, CentOS or RHEL, you can install them with:
|
52 | 52 | |
... | ... | @@ -57,7 +57,7 @@ If you are running Fedora, CentOS or RHEL, you can install them with: |
57 | 57 | "perl(File::Copy::Recursive)" "perl(String::ShellQuote)" \
|
58 | 58 | "perl(Sort::Versions)" "perl(Digest::SHA)" "perl(Data::UUID)" \
|
59 | 59 | "perl(Data::Dump)" "perl(DateTime)" "perl(XML::Writer)" \
|
60 | - "perl(Parallel::ForkManager)" perl-ph mercurial git zstd
|
|
60 | + "perl(Parallel::ForkManager)" perl-ph git zstd
|
|
61 | 61 | |
62 | 62 | If you are running an Arch based system, you should be able to install them with:
|
63 | 63 |
... | ... | @@ -2,15 +2,22 @@ |
2 | 2 | version: '[% pc("firefox", "abbrev") %]'
|
3 | 3 | filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-[% c("var/build_id") %]'
|
4 | 4 | link_input_files: 1
|
5 | +# We need to specify git_url in the root to make this project recognized as a
|
|
6 | +# git project, we canoot specify the git_url only in the step.
|
|
7 | +# However, once we specify a git_url, we need to specify a valid git_hash for
|
|
8 | +# the final stage, even though we are not going to use it.
|
|
9 | +# Any hash will work, as long as we can run git archive on it.
|
|
10 | +git_url: https://github.com/mozilla-l10n/firefox-l10n.git
|
|
11 | +git_hash: c1523924f0e10259e1a80b8268556f6f7a0b29bf
|
|
5 | 12 | |
6 | 13 | steps:
|
7 | 14 | fetch_locale:
|
8 | - filename: 'l10n-[% c("input_file_var/locale") %]-[% c("hg_hash") %]-[% c("var/build_id") %].tar.xz'
|
|
9 | - version: '[% c("hg_hash") %]'
|
|
15 | + filename: 'l10n-[% c("input_file_var/locale") %]-[% c("abbrev") %]-[% c("var/build_id") %].tar.xz'
|
|
16 | + version: '[% c("git_hash") %]'
|
|
10 | 17 | fetch_locale: |
|
11 | 18 | [% c("var/set_default_env") -%]
|
12 | 19 | tar xf '[% project %]-[% c("version") %].tar.[% c("compress_tar") %]'
|
13 | - mv [% project %]-[% c("version") %] [% c("input_file_var/locale") %]
|
|
20 | + cd [% project %]-[% c("version") %]
|
|
14 | 21 | tar caf '[% dest_dir %]/[% c("filename") %]' [% c("input_file_var/locale") %]
|
15 | 22 | input_files: []
|
16 | 23 | --- |
|
... | ... | @@ -38,9 +45,7 @@ steps: |
38 | 45 | name => $locale,
|
39 | 46 | project => 'firefox-l10n',
|
40 | 47 | pkg_type => 'fetch_locale',
|
41 | - hg_hash => $revision,
|
|
42 | - hg_url => "https://hg.mozilla.org/l10n-central/$locale",
|
|
43 | - hg_clone_subdir => $locale,
|
|
48 | + git_hash => $revision,
|
|
44 | 49 | input_file_var => {
|
45 | 50 | locale => $locale,
|
46 | 51 | },
|