diff --git a/configs/common/mozconfig b/configs/common/mozconfig index 778880c..4dbbab0 100644 --- a/configs/common/mozconfig +++ b/configs/common/mozconfig @@ -1,24 +1,25 @@ # Browser branding ac_add_options --enable-update-channel=release -ac_add_options --with-branding=${brandingDir} -ac_add_options --with-app-name=dot -export MOZ_USER_DIR="${name}" -export MOZ_APP_VENDOR="${vendor}" +# ac_add_options --with-branding=branding/unofficial +ac_add_options --with-app-name=focus-browser +export MOZ_USER_DIR="Focus browser" +export MOZ_APP_VENDOR="Focus browser" export MOZ_APP_BASENAME=Dot -export MOZ_APP_PROFILE=dot -export MOZ_APP_DISPLAYNAME="${name}" -export MOZ_BRANDING_DIRECTORY=${brandingDir} -export MOZ_OFFICIAL_BRANDING_DIRECTORY=${brandingDir} -export MOZ_MACBUNDLE_ID=${appId} -export MOZ_DISTRIBUTION_ID=${appId} +export MOZ_APP_PROFILE=focus-browser +export MOZ_APP_DISPLAYNAME="Focus browser" +# Temporaroly removed +# export MOZ_BRANDING_DIRECTORY=branding/unofficial +# export MOZ_OFFICIAL_BRANDING_DIRECTORY=branding/unofficial +export MOZ_MACBUNDLE_ID=com.fushra.focus.desktop +export MOZ_DISTRIBUTION_ID=com.fushra.focus.desktop # Uncomment if builds are too resource hungry -# mk_add_options MOZ_MAKE_FLAGS="-j4" -# ac_add_options --enable-linker=gold +mk_add_options MOZ_MAKE_FLAGS="-j4" +ac_add_options --enable-linker=gold # Misc export MOZ_STUB_INSTALLER=1 export MOZ_INCLUDE_SOURCE_INFO=1 export MOZ_SOURCE_REPO=https://github.com/dothq/browser-desktop -export MOZ_SOURCE_CHANGESET=5893b1f8552ad0956b28ffd8105bf706bc9ee6fa +export MOZ_SOURCE_CHANGESET=6185a4cb9f00a367c09f3909e7d6a9bc72dcfbf1 diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig index 2e40875..4105cac 100644 --- a/configs/linux/mozconfig +++ b/configs/linux/mozconfig @@ -1,12 +1,12 @@ # Optimise builds -ac_add_options --enable-application=browser -ac_add_options --enable-hardening -ac_add_options --enable-rust-simd -ac_add_options --enable-release -ac_add_options --enable-optimize -ac_add_options --with-ccache=sccache -ac_add_options --disable-debug -ac_add_options --enable-updater +# ac_add_options --enable-application=browser +# ac_add_options --enable-hardening +# ac_add_options --enable-rust-simd +# ac_add_options --enable-release +# ac_add_options --enable-optimize +# ac_add_options --with-ccache=sccache +# ac_add_options --disable-debug +# ac_add_options --enable-updater # Disable telemetry and tracking mk_add_options MOZ_TELEMETRY_REPORTING= diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig index 40f0fd3..fbbf75f 100644 --- a/configs/macos/mozconfig +++ b/configs/macos/mozconfig @@ -1,13 +1,13 @@ # Optimise builds -ac_add_options --enable-application=browser -ac_add_options --enable-hardening -ac_add_options --enable-rust-simd -ac_add_options --enable-release -ac_add_options --enable-optimize -ac_add_options --with-ccache=sccache -ac_add_options --disable-debug -ac_add_options --enable-updater -mk_add_options MOZ_MAKE_FLAGS="-j4" +# ac_add_options --enable-application=browser +# ac_add_options --enable-hardening +# ac_add_options --enable-rust-simd +# ac_add_options --enable-release +# ac_add_options --enable-optimize +# ac_add_options --with-ccache=sccache +# ac_add_options --disable-debug +# ac_add_options --enable-updater +# mk_add_options MOZ_MAKE_FLAGS="-j4" # Disable telemetry and tracking mk_add_options MOZ_TELEMETRY_REPORTING= diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig index cf123fc..bdcd43d 100644 --- a/configs/windows/mozconfig +++ b/configs/windows/mozconfig @@ -1,7 +1,7 @@ -ac_add_options --target=x86_64-pc-mingw32 -ac_add_options --enable-js-shell -ac_add_options --enable-rust-simd -ac_add_options --enable-crashreporter +# ac_add_options --target=x86_64-pc-mingw32 +# ac_add_options --enable-js-shell +# ac_add_options --enable-rust-simd +# ac_add_options --enable-crashreporter # Disable telemetry and tracking mk_add_options MOZ_TELEMETRY_REPORTING= diff --git a/melon b/melon index f23019e..baaddb1 160000 --- a/melon +++ b/melon @@ -1 +1 @@ -Subproject commit f23019e26677caac5001e2af87a6d24e57e016f7 +Subproject commit baaddb12af37e150cc69c3307875ceaff43c33e3 diff --git a/melon.json b/melon.json index d3ce964..a43a67a 100644 --- a/melon.json +++ b/melon.json @@ -6,5 +6,9 @@ "product": "firefox", "version": "94.0.1", "displayVersion": "1.0.0" + }, + "buildOptions": { + "artifactBuilds": false, + "generateBranding": false } -} \ No newline at end of file +}