Bug 1822869 - Install .deb langpacks in the same folder as the application r=gabriel

Differential Revision: https://phabricator.services.mozilla.com/D172812
This commit is contained in:
Johan Lorenzo 2023-03-22 17:25:42 +00:00
Родитель 5fb35acee0
Коммит dbf53eff3e
3 изменённых файлов: 8 добавлений и 2 удалений

Просмотреть файл

@ -1 +1 @@
firefox/* usr/lib/${DEB_PKG_NAME}
firefox/* ${DEB_PKG_INSTALL_PATH}

Просмотреть файл

@ -191,11 +191,13 @@ def _get_build_variables(
if version.is_nightly
else f"{version}~build{build_number}"
)
remoting_name = application_ini_data["remoting_name"].lower()
return {
"DEB_DESCRIPTION": f"{application_ini_data['vendor']} {application_ini_data['display_name']}"
f"{description_suffix}",
"DEB_PKG_NAME": f"{application_ini_data['remoting_name'].lower()}{package_name_suffix}",
"DEB_PKG_INSTALL_PATH": f"usr/lib/{remoting_name}",
"DEB_PKG_NAME": f"{remoting_name}{package_name_suffix}",
"DEB_PKG_VERSION": deb_pkg_version,
"DEB_CHANGELOG_DATE": format_datetime(application_ini_data["timestamp"]),
"DEB_ARCH_NAME": _DEB_ARCH[arch],

Просмотреть файл

@ -81,6 +81,7 @@ def test_extract_application_ini_data_from_directory():
"",
{
"DEB_DESCRIPTION": "Mozilla Firefox",
"DEB_PKG_INSTALL_PATH": "usr/lib/firefox-nightly-try",
"DEB_PKG_NAME": "firefox-nightly-try",
"DEB_PKG_VERSION": "112.0a1~20230222000000",
},
@ -92,6 +93,7 @@ def test_extract_application_ini_data_from_directory():
" - Language pack for Firefox Nightly for fr",
{
"DEB_DESCRIPTION": "Mozilla Firefox - Language pack for Firefox Nightly for fr",
"DEB_PKG_INSTALL_PATH": "usr/lib/firefox-nightly-try",
"DEB_PKG_NAME": "firefox-nightly-try-l10n-fr",
"DEB_PKG_VERSION": "112.0a1~20230222000000",
},
@ -103,6 +105,7 @@ def test_extract_application_ini_data_from_directory():
"",
{
"DEB_DESCRIPTION": "Mozilla Firefox",
"DEB_PKG_INSTALL_PATH": "usr/lib/firefox-nightly-try",
"DEB_PKG_NAME": "firefox-nightly-try",
"DEB_PKG_VERSION": "112.0b1~build1",
},
@ -114,6 +117,7 @@ def test_extract_application_ini_data_from_directory():
"",
{
"DEB_DESCRIPTION": "Mozilla Firefox",
"DEB_PKG_INSTALL_PATH": "usr/lib/firefox-nightly-try",
"DEB_PKG_NAME": "firefox-nightly-try",
"DEB_PKG_VERSION": "112.0~build2",
},