Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
61b37707 by Henry Wilkes at 2024-12-03T13:51:42+00:00
Bug 43336: Update handling of translation files.
We make the handling of translation files more consistent between
builds.
For `base-browser` files:
+ We no longer copy to `browser/chrome/browser/` because we no longer
have .properties files in this branch.
For `tor-browser` files:
+ We use a symbolic link to translate from ja to ja-JP-mac.
+ We use pushd and popd.
+ We only copy the .properties files to torbutton since these are the
only files left in this directory.
- - - - -
6cf8f931 by Henry Wilkes at 2024-12-04T15:49:59+00:00
Bug 43336: Move tor-browser branding files to branding directory.
- - - - -
1 changed file:
- projects/firefox/build
Changes:
=====================================
projects/firefox/build
=====================================
@@ -114,6 +114,8 @@ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
# Create .mozbuild to avoid interactive prompt in configure
mkdir "$HOME/.mozbuild"
+branding_dir=browser/branding/[% c("var/branding_directory_prefix") %]-[% c("var/channel") %]
+
[% IF c("var/has_l10n") -%]
supported_locales="[% tmpl(c('var/locales').join(' ')) %]"
@@ -129,28 +131,30 @@ mkdir "$HOME/.mozbuild"
for lang in $supported_locales; do
# Fluent
mv $lang/base-browser.ftl "$l10ncentral/$lang/toolkit/toolkit/global/"
- # Properties (they use a different directory)
- mv $lang/* "$l10ncentral/$lang/browser/chrome/browser/"
done
popd
[% IF c("var/tor-browser") -%]
- # We will have to keep the torbutton.jar until we stop using dtds, because
- # if we move them to the browser locale directory, browser.xhtml is not
- # loaded.
tar -C "$rootdir" -xf "$rootdir/[% c('input_files_by_name/translation-tor-browser') %]"
- transl_tor_browser="$rootdir/translation-tor-browser"
+ pushd "$rootdir/translation-tor-browser"
+ ln -s ja ja-JP-mac
+ for lang in $supported_locales; do
+ mv $lang/tor-browser.ftl "$l10ncentral/$lang/toolkit/toolkit/global/"
+ # Branding. Currently all releases use the same branding.
+ l10n_branding_dir="$l10ncentral/$lang/$branding_dir/"
+ mkdir -p "$l10n_branding_dir"
+ mv $lang/branding/brand.ftl "$l10n_branding_dir"
+ mv $lang/brand.properties "$l10n_branding_dir"
+ done
+ popd
+
+ # torbutton properties files.
+ # TODO: Remove once we no longer have torbutton locale files.
torbutton_locales="toolkit/torbutton/chrome/locale/"
torbutton_jar="toolkit/torbutton/jar.mn"
for lang in $supported_locales; do
- source_lang=$lang
- [% IF c("var/macos") -%]
- if [ "$lang" == "ja-JP-mac" ]; then
- source_lang="ja"
- fi
- [% END -%]
- mv "$transl_tor_browser/$source_lang/tor-browser.ftl" "$l10ncentral/$lang/toolkit/toolkit/global/"
- mv "$transl_tor_browser/$source_lang" "$torbutton_locales/$lang"
+ mkdir -p "$torbutton_locales/$lang"
+ mv "$rootdir/translation-tor-browser/$lang"/*.properties "$torbutton_locales/$lang/"
echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar"
echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar"
done
@@ -176,7 +180,7 @@ echo "Starting ./mach configure $(date)"
--with-distribution-id=org.torproject \
--with-base-browser-version=[% c("var/torbrowser_version") %] \
[% IF c("var/updater_enabled") -%]--enable-update-channel=[% c("var/channel") %][% END %] \
- [% IF !c("var/base-browser") -%]--with-branding=browser/branding/[% c("var/branding_directory_prefix") %]-[% c("var/channel") %][% END %] \
+ [% IF !c("var/base-browser") -%]--with-branding="$branding_dir"[% END %] \
[% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %]
echo "Starting ./mach build $(date)"
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch mullvad-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser
Commits:
93162bec by cypherpunks1 at 2024-12-04T10:41:13+01:00
fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
Bug 43334: Restore RemoteSettings dumps for devtools-compatibility-browsers and devtools-devices
- - - - -
cc08546c by NoisyCoil at 2024-12-04T10:41:53+01:00
fixup! Base Browser's .mozconfigs.
Bug 43340: Add mozconfig-linux-aarch64-dev
Copy mozconfig-linux-x86_64-dev, except that linux-aarch64 does not
support the {enable,disable}-eme options
- - - - -
5f129674 by Pier Angelo Vendrame at 2024-12-04T10:43:03+01:00
fixup! MB 38: Mullvad Browser configuration
Bug 43340: Add mozconfig-linux-aarch64-dev
- - - - -
2 changed files:
- + mozconfig-linux-aarch64-dev
- services/settings/dumps/main/moz.build
Changes:
=====================================
mozconfig-linux-aarch64-dev
=====================================
@@ -0,0 +1,19 @@
+. $topsrcdir/browser/config/mozconfigs/mullvad-browser
+
+# This mozconfig file is not used in official builds.
+# It is only intended to be used when doing incremental Linux builds
+# during development.
+
+# Moz switched to lld for all Linux targets in Bug 1839739.
+ac_add_options --enable-linker=lld
+
+export MOZILLA_OFFICIAL=
+ac_add_options --with-branding=browser/branding/mb-nightly
+
+ac_add_options --enable-default-toolkit=cairo-gtk3
+
+ac_add_options --disable-strip
+ac_add_options --disable-install-strip
+
+ac_add_options --with-base-browser-version=dev-build
+ac_add_options --disable-base-browser-update
=====================================
services/settings/dumps/main/moz.build
=====================================
@@ -14,6 +14,8 @@ if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"):
FINAL_TARGET_FILES.defaults.settings.main += [
"anti-tracking-url-decoration.json",
"cookie-banner-rules-list.json",
+ "devtools-compatibility-browsers.json",
+ "devtools-devices.json",
"example.json",
"hijack-blocklists.json",
"password-rules.json",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/eb…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/eb…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch base-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
47f3899c by NoisyCoil at 2024-12-04T10:40:10+01:00
Bug 43340: Add mozconfig-linux-aarch64-dev
Copy mozconfig-linux-x86_64-dev, except that linux-aarch64 does not
support the {enable,disable}-eme options
- - - - -
1 changed file:
- + mozconfig-linux-aarch64-dev
Changes:
=====================================
mozconfig-linux-aarch64-dev
=====================================
@@ -0,0 +1,18 @@
+. $topsrcdir/browser/config/mozconfigs/base-browser
+
+# This mozconfig file is not used in official builds.
+# It is only intended to be used when doing incremental Linux builds
+# during development.
+
+# Moz switched to lld for all Linux targets in Bug 1839739.
+ac_add_options --enable-linker=lld
+
+export MOZILLA_OFFICIAL=
+
+ac_add_options --enable-default-toolkit=cairo-gtk3
+
+ac_add_options --disable-strip
+ac_add_options --disable-install-strip
+
+ac_add_options --with-base-browser-version=dev-build
+ac_add_options --disable-base-browser-update
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47f3899…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47f3899…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch base-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
857bd22e by cypherpunks1 at 2024-12-04T10:38:17+01:00
fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
Bug 43334: Restore RemoteSettings dumps for devtools-compatibility-browsers and devtools-devices
- - - - -
1 changed file:
- services/settings/dumps/main/moz.build
Changes:
=====================================
services/settings/dumps/main/moz.build
=====================================
@@ -14,6 +14,8 @@ if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"):
FINAL_TARGET_FILES.defaults.settings.main += [
"anti-tracking-url-decoration.json",
"cookie-banner-rules-list.json",
+ "devtools-compatibility-browsers.json",
+ "devtools-devices.json",
"example.json",
"hijack-blocklists.json",
"password-rules.json",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/857bd22…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/857bd22…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
395fc108 by cypherpunks1 at 2024-12-04T09:32:06+00:00
fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
Bug 43334: Restore RemoteSettings dumps for devtools-compatibility-browsers and devtools-devices
- - - - -
1 changed file:
- services/settings/dumps/main/moz.build
Changes:
=====================================
services/settings/dumps/main/moz.build
=====================================
@@ -14,6 +14,8 @@ if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"):
FINAL_TARGET_FILES.defaults.settings.main += [
"anti-tracking-url-decoration.json",
"cookie-banner-rules-list.json",
+ "devtools-compatibility-browsers.json",
+ "devtools-devices.json",
"example.json",
"hijack-blocklists.json",
"password-rules.json",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/395fc10…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/395fc10…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
f905a88c by Pier Angelo Vendrame at 2024-12-03T19:11:20+00:00
Revert "Bug 43099: 2024 YEC"
Bug 43343: Revert YEC 2024
This reverts commit 245cd26bd665facee04c41032efd5687ed8dc625.
- - - - -
035f30c6 by Pier Angelo Vendrame at 2024-12-03T19:11:20+00:00
Revert "Bug 43098: Year End Campaign 2024."
Bug 43343: Revert YEC 2024
This reverts commit 31d3d5e6556a254802ad3f9754497305c2c77187.
- - - - -
17 changed files:
- browser/components/BrowserGlue.sys.mjs
- browser/components/abouttor/AboutTorChild.sys.mjs
- browser/components/abouttor/AboutTorParent.sys.mjs
- browser/components/abouttor/content/aboutTor.css
- browser/components/abouttor/content/aboutTor.html
- browser/components/abouttor/content/aboutTor.js
- − browser/components/abouttor/content/yec-2024-browse.svg
- − browser/components/abouttor/content/yec-2024-fonts.css
- − browser/components/abouttor/content/yec-2024-heart.svg
- − browser/components/abouttor/content/yec-2024-search.svg
- − browser/components/abouttor/content/yec-2024-speak.svg
- browser/components/abouttor/jar.mn
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeScreenViewModel.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
- − mobile/android/fenix/app/src/main/res/drawable/heart.xml
- − mobile/android/fenix/app/src/main/res/drawable/illo_green_browse.xml
The diff was not included because it is too large.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c1951f…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c1951f…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
d1eed871 by NoisyCoil at 2024-12-03T18:56:33+00:00
Bug 43340: Add mozconfig-linux-aarch64-dev
Copy mozconfig-linux-x86_64-dev, except that linux-aarch64 does not
support the {enable,disable}-eme options
- - - - -
85faa5f2 by NoisyCoil at 2024-12-03T18:56:33+00:00
Bug 43340: Fetch aarch64 alphas for linux aarch64 dev builds
- - - - -
c1951fdb by NoisyCoil at 2024-12-03T18:56:33+00:00
Bug 43340: Use the correct vendor in linux aarch64 dev builds
- - - - -
3 changed files:
- + mozconfig-linux-aarch64-dev
- tools/torbrowser/Makefile
- tools/torbrowser/fetch.sh
Changes:
=====================================
mozconfig-linux-aarch64-dev
=====================================
@@ -0,0 +1,20 @@
+. $topsrcdir/browser/config/mozconfigs/tor-browser
+
+# This mozconfig file is not used in official builds.
+# It is only intended to be used when doing incremental Linux builds
+# during development.
+
+# Moz switched to lld for all Linux targets in Bug 1839739.
+ac_add_options --enable-linker=lld
+
+export MOZILLA_OFFICIAL=
+export MOZ_APP_REMOTINGNAME="Tor Browser Dev"
+ac_add_options --with-branding=browser/branding/tb-nightly
+
+ac_add_options --enable-default-toolkit=cairo-gtk3
+
+ac_add_options --disable-strip
+ac_add_options --disable-install-strip
+
+ac_add_options --with-base-browser-version=dev-build
+ac_add_options --disable-base-browser-update
=====================================
tools/torbrowser/Makefile
=====================================
@@ -12,11 +12,17 @@ ifeq ($(ARCHITECTURE), "arm64")
ARCHITECTURE = "aarch64"
endif
+ifeq ($(ARCHITECTURE), "aarch64")
+ LINUX_VENDOR = "unknown"
+else
+ LINUX_VENDOR = "pc"
+endif
+
# Define build output path based on the platform.
ifeq ("$(shell uname)", "Darwin")
BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-apple-darwin$(shell uname -r)"
else
- BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-pc-linux-gnu"
+ BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-$(LINUX_VENDOR)-linux-gnu"
endif
# Define the run command based on the platform.
=====================================
tools/torbrowser/fetch.sh
=====================================
@@ -10,7 +10,7 @@ TOR_BROWSER_VERSION=$(grep -Eo "\"version\":\"[0-9.a]+\"" downloads.json | grep
if [ "$(uname)" = "Darwin" ]; then
TOR_BROWSER_PACKAGE="tor-browser-macos-${TOR_BROWSER_VERSION}.dmg"
else
- TOR_BROWSER_PACKAGE="tor-browser-linux-x86_64-${TOR_BROWSER_VERSION}.tar.xz"
+ TOR_BROWSER_PACKAGE="tor-browser-linux-$(uname -m)-${TOR_BROWSER_VERSION}.tar.xz"
fi
TOR_BROWSER_PACKAGE_URL="https://dist.torproject.org/torbrowser/${TOR_BROWSER_VERSION}/${TOR_BROWSER…"
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/efd91f…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/efd91f…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
6756b736 by Pier Angelo Vendrame at 2024-12-02T18:33:34+01:00
fixup! Bug 40933: Add tor-launcher functionality
Bug 43326: Restrict the changes to LD_LIBRARY_PATH.
We used to set LD_LIBRARY_PATH for the tor daemon before launching the
browser, but this does not work well for some distributions, which
link to the latest version of OpenSSL, whereas we link to the LTS.
To avoid conflicts, we can set a custom LD_LIBRARY_PATH only for the
tor daemon.
- - - - -
2 changed files:
- toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs
- toolkit/components/tor-launcher/TorProcess.sys.mjs
Changes:
=====================================
toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs
=====================================
@@ -5,6 +5,8 @@
* Tor Launcher Util JS Module
*************************************************************************/
+import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
+
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
@@ -335,6 +337,13 @@ export const TorLauncherUtil = Object.freeze({
return Services.appinfo.OS === "Android";
},
+ get isLinux() {
+ // Use AppConstants for Linux rather then appinfo because we are sure it
+ // will catch also various Unix flavors for which unofficial ports might
+ // exist (which should work as Linux, as far as we know).
+ return AppConstants.platform === "linux";
+ },
+
get isMac() {
return Services.appinfo.OS === "Darwin";
},
=====================================
toolkit/components/tor-launcher/TorProcess.sys.mjs
=====================================
@@ -125,6 +125,16 @@ export class TorProcess {
stderr: "stdout",
workdir: lazy.TorLauncherUtil.getTorFile("pt-startup-dir", false).path,
};
+ if (lazy.TorLauncherUtil.isLinux) {
+ let ldLibPath = Services.env.get("LD_LIBRARY_PATH") ?? "";
+ if (ldLibPath) {
+ ldLibPath = ":" + ldLibPath;
+ }
+ options.environment = {
+ LD_LIBRARY_PATH: this.#exeFile.parent.path + ldLibPath,
+ };
+ options.environmentAppend = true;
+ }
this.#subprocess = await Subprocess.call(options);
this.#status = TorProcessStatus.Running;
} catch (e) {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6756b73…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6756b73…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
b7c816f8 by Pier Angelo Vendrame at 2024-12-02T18:34:39+01:00
Bug 41328: Exclude tor dependencies from LD_LIBRARY_PATH.
We discovered in tor-browser#43326 that adding our OpenSSL to
LD_LIBRARY_PATH might cause the browser not to work in some distros.
So, we decided to add them to LD_LIBRARY_PATH only for the tor daemon,
instead.
- - - - -
1 changed file:
- projects/firefox/start-firefox
Changes:
=====================================
projects/firefox/start-firefox
=====================================
@@ -17,9 +17,6 @@ add_LD_LIBRARY_PATH() {
if [ $? -ne 0 ]; then
add_LD_LIBRARY_PATH "$basedir/[% IF c("var/tor-browser") -%]TorBrowser/Tor/[% END -%]libstdc++/"
fi
-[% IF c("var/tor-browser") -%]
-add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/"
-[% END -%]
export LD_LIBRARY_PATH
exec "$basedir/[% c("var/exe_name") %].real" "$@"
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b…
You're receiving this email because of your account on gitlab.torproject.org.
boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
78039907 by NoisyCoil at 2024-12-02T17:22:49+01:00
Bug 41329: Add no_install_recommends option to container-image
- - - - -
8a16e82b by NoisyCoil at 2024-12-02T17:22:51+01:00
Bug 41329: Set no_install_recommends for linux-aarch64 firefox
Avoids installing python2.7-minimal:arm64, which is never used and
whose postinst script tries to execute the arm64 native python
binary on x86_64 (affects every Debian release where it still
exists)
- - - - -
2 changed files:
- projects/container-image/config
- projects/firefox/config
Changes:
=====================================
projects/container-image/config
=====================================
@@ -64,8 +64,9 @@ pre: |
res_deps = res_deps.sort.unique;
END;
IF res_deps.size;
+ SET no_install_recommends = pc(c('origin_project'), 'var/no_install_recommends', { step => c('origin_step') });
FOREACH pkg IN res_deps;
- GET c('install_package', { pkg_name => pkg });
+ GET c('install_package', { pkg_name => pkg, no_install_recommends => no_install_recommends });
GET "\n";
END;
END;
=====================================
projects/firefox/config
=====================================
@@ -146,6 +146,7 @@ targets:
linux-aarch64:
var:
+ no_install_recommends: 1
arch_deps:
- libgtk2.0-dev:arm64
- libgtk-3-dev:arm64
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/…
You're receiving this email because of your account on gitlab.torproject.org.
boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
2eb95d67 by Nicolas Vigier at 2024-12-02T17:13:42+01:00
Update rbm for rbm#40081
- - - - -
1 changed file:
- rbm
Changes:
=====================================
rbm
=====================================
@@ -1 +1 @@
-Subproject commit f18daa3f93d1aec674e4ba0dfbd22ac6afd6f8c9
+Subproject commit c6a40950607fa73861f81185764dff2bab150010
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build
Commits:
0bad6cae by Nicolas Vigier at 2024-11-27T20:33:16+00:00
Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar
- - - - -
1 changed file:
- tools/dmg2mar
Changes:
=====================================
tools/dmg2mar
=====================================
@@ -164,7 +164,7 @@ sub convert_files {
(undef, $err, $success) = capture_exec('make_full_update.sh', '-q',
$output, $appdir);
exit_error "Error updating $output: $err" unless $success;
- exit_error "make_full_update.sh failed. $output does not exist."
+ exit_error "make_full_update.sh failed. $output was not created.\n$err"
unless -f $output;
$pm->finish;
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build
Commits:
bb8c25be by Nicolas Vigier at 2024-11-27T20:32:49+00:00
Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar
- - - - -
1 changed file:
- tools/dmg2mar
Changes:
=====================================
tools/dmg2mar
=====================================
@@ -165,7 +165,7 @@ sub convert_files {
(undef, $err, $success) = capture_exec('make_full_update.sh', '-q',
$output, $appdir);
exit_error "Error updating $output: $err" unless $success;
- exit_error "make_full_update.sh failed. $output does not exist."
+ exit_error "make_full_update.sh failed. $output was not created.\n$err"
unless -f $output;
$pm->finish;
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
55c24300 by Nicolas Vigier at 2024-11-27T17:57:04+01:00
Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar
- - - - -
1 changed file:
- tools/dmg2mar
Changes:
=====================================
tools/dmg2mar
=====================================
@@ -165,7 +165,7 @@ sub convert_files {
(undef, $err, $success) = capture_exec('make_full_update.sh', '-q',
$output, $appdir);
exit_error "Error updating $output: $err" unless $success;
- exit_error "make_full_update.sh failed. $output does not exist."
+ exit_error "make_full_update.sh failed. $output was not created.\n$err"
unless -f $output;
$pm->finish;
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5…
You're receiving this email because of your account on gitlab.torproject.org.
boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
d21f57b2 by Nicolas Vigier at 2024-11-27T14:57:25+01:00
Bug 41326: Remove var/torbrowser_legacy_version and var/torbrowser_legacy_platform_version
- - - - -
2 changed files:
- projects/release/update_responses_config.yml
- rbm.conf
Changes:
=====================================
projects/release/update_responses_config.yml
=====================================
@@ -29,9 +29,6 @@ build_targets:
channels:
[% c('var/channel') %]:
- [% c("var/torbrowser_version") %]
-[% IF c("var/tor-browser") && c("var/torbrowser_legacy_version") -%]
- - [% c("var/torbrowser_legacy_version") %]
-[% END -%]
versions:
[% c("var/torbrowser_version") %]:
[% IF c("var/create_unsigned_incrementals") -%]
@@ -72,25 +69,6 @@ versions:
minSupportedInstructionSet: SSE2
linux-x86_64:
minSupportedInstructionSet: SSE2
-[% IF c("var/tor-browser") && c("var/torbrowser_legacy_version") -%]
- [% c("var/torbrowser_legacy_version") %]:
- mar_channel_id: [% c('var/mar_channel_id') %]
- platformVersion: [% c('var/torbrowser_legacy_platform_version') %]
- detailsURL: https://blog.torproject.org/new[% IF c("var/alpha") %]-alpha[% END %]-release-tor-browser-[% c("var/torbrowser_legacy_version") FILTER remove('\.') %]
- # minSupportedOsVersion on macOS corresponds to the Darwin version ( https://en.wikipedia.org/wiki/Darwin_(operating_system) )
- macos:
- # macOS v10.12.0
- minSupportedOSVersion: 16.0.0
- # minSupportedOsVersion on Windows corresponds to the operating system version ( https://docs.microsoft.com/en-us/windows/win32/sysinfo/operating-system-ver… )
- windows-i686:
- # Windows 7
- minSupportedOSVersion: 6.1
- minSupportedInstructionSet: SSE2
- windows-x86_64:
- # Windows 7
- minSupportedOSVersion: 6.1
- minSupportedInstructionSet: SSE2
-[% END -%]
mar_compression: xz
[% IF c("var/tor-browser") -%]
tag: 'tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]'
=====================================
rbm.conf
=====================================
@@ -88,9 +88,6 @@ var:
- '[% IF c("var/tor-browser") %]14.0a7[% END %]'
mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
- torbrowser_legacy_version: 13.5a11
- torbrowser_legacy_platform_version: 115.16.0
-
# By default, we sort the list of installed packages. This allows sharing
# containers with identical list of packages, even if they are not listed
# in the same order. In the cases where the installation order is
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d…
You're receiving this email because of your account on gitlab.torproject.org.
boklm pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build
Commits:
44e12497 by Nicolas Vigier at 2024-11-27T14:42:55+01:00
Bug 41325: Exclude Applications symlink when extracting dmg file in dmg2mar
Recent versions of 7z fail to extract our dmg files since the
`Applications` symlink points outside the archive:
https://sourceforge.net/p/sevenzip/discussion/45797/thread/9f5b067368/?page…
We exclude the `Applications` symlink to avoid the issue. We don't need
it since it is not included in the mar file.
- - - - -
1 changed file:
- tools/dmg2mar
Changes:
=====================================
tools/dmg2mar
=====================================
@@ -132,6 +132,7 @@ sub convert_files {
$pm->start($step_name) and next;
my $tmpdir = File::Temp->newdir();
my (undef, $err, $success) = capture_exec('7z', 'x', "-o$tmpdir",
+ '-x!*/Applications',
$file->{filename});
exit_error "Error extracting $file->{filename}: $err" unless $success;
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4…
You're receiving this email because of your account on gitlab.torproject.org.