Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions configs/common/mozconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ac_add_options --enable-update-channel=stable
ac_add_options --with-ccache=sccache
ac_add_options --without-wasm-sandboxed-libraries

ac_add_options --with-app-basename="Pulse Browser"
ac_add_options --with-app-name=pulse-browser
export MOZ_USER_DIR="Pulse browser"
export MOZ_APP_VENDOR="Pulse browser"
Expand All @@ -11,6 +12,7 @@ export MOZ_APP_PROFILE=pulse-browser
export MOZ_APP_DISPLAYNAME="Pulse browser"
export MOZ_MACBUNDLE_ID=com.fushra.browser.desktop
export MOZ_DISTRIBUTION_ID=com.fushra.browser.desktop
export MAC_APP_NAME="Pulse browser"

# Speed up builds by disabling components we don't care about
ac_add_options --disable-geckodriver
Expand Down
2 changes: 1 addition & 1 deletion gluon
Submodule gluon updated from 1a5ec0 to 8d64fc
2 changes: 1 addition & 1 deletion gluon.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"binaryName": "pulse-browser",
"version": {
"product": "firefox",
"version": "100.0.1",
"version": "100.0.2",
"displayVersion": "1.0.0"
},
"buildOptions": {
Expand Down
31 changes: 31 additions & 0 deletions src/python/mozboot/mozboot/osx-py.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/python/mozboot/mozboot/osx.py b/python/mozboot/mozboot/osx.py
index 8c8c478d2ef6bb7a0ba45a67cfb694d13fce3716..82ed833ea14db8de47e5aec9dd0f049e99b5973c 100644
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -284,16 +284,23 @@ class OSXBootstrapper(OSXAndroidBootstrapper, BaseBootstrapper):
self.install_homebrew()

def ensure_clang_static_analysis_package(self):
- from mozboot import static_analysis
+ # NOTE: This function has been removed as it caused numerous problems
+ # with the boostrap process for v100.0.2. May be fixed in the future,
+ # so we can return it
+ pass
+ # from mozboot import static_analysis

- self.install_toolchain_static_analysis(static_analysis.MACOS_CLANG_TIDY)
+ # self.install_toolchain_static_analysis(static_analysis.MACOS_CLANG_TIDY)

def ensure_sccache_packages(self):
from mozboot import sccache

self.install_toolchain_artifact("sccache")
self.install_toolchain_artifact(sccache.RUSTC_DIST_TOOLCHAIN, no_unpack=True)
- self.install_toolchain_artifact(sccache.CLANG_DIST_TOOLCHAIN, no_unpack=True)
+ # NOTE: This function has been removed as it caused numerous problems
+ # with the boostrap process for v100.0.2. May be fixed in the future,
+ # so we can return it
+ # self.install_toolchain_artifact(sccache.CLANG_DIST_TOOLCHAIN, no_unpack=True)

def ensure_fix_stacks_packages(self):
self.install_toolchain_artifact("fix-stacks")