Verified Commit 62e78d01 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! Base Browser's .mozconfigs. 

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Removed the --enable-base-browser flag and the BASE_BROWSER macro and
added --with-base-browser-version to the -dev mozconfig.
parent 368f79a0

browser/config/mozconfigs/base-browser

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ ac_add_options --disable-system-policies 
# See bug #41131

ac_add_options --disable-backgroundtasks



ac_add_options --enable-base-browser



# Disable telemetry

ac_add_options MOZ_TELEMETRY_REPORTING=

browser/config/mozconfigs/base-browser-android

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ ac_add_options --disable-parental-controls 
ac_add_options --enable-proxy-bypass-protection

ac_add_options --disable-system-policies



ac_add_options --enable-base-browser



# Disable telemetry

ac_add_options MOZ_TELEMETRY_REPORTING=

moz.configure

+27 −4
Original line number Diff line number Diff line
@@ -1016,13 +1016,36 @@ def zlib_in_mozglue(system_zlib, js_shared, linker, os): 
set_config("ZLIB_IN_MOZGLUE", zlib_in_mozglue)

set_define("ZLIB_IN_MOZGLUE", zlib_in_mozglue)





option(

    "--enable-base-browser",

    help="Enable Base Browser"

    "--with-base-browser-version",

    nargs=1,

    help="Set the Base Browser version, e.g., 7.0a1"

)





@depends("--with-base-browser-version")

def base_browser_version(value):

    if not value:

        die(

            "--with-base-browser-version is required for Base Browser and derived browsers."

        )

    return value[0]





@depends("--with-base-browser-version")

def base_browser_version_quoted(value):

    if not value:

        die(

            "--with-base-browser-version is required for Base Browser and derived browsers."

        )

    if '"' in value or "\\" in value:

        die("--with-base-browser-version cannot contain \" or \\.")

    return '"{}"'.format(value[0])





set_config("BASE_BROWSER", True, when="--enable-base-browser")

set_define("BASE_BROWSER", True, when="--enable-base-browser")

set_define("BASE_BROWSER_VERSION", base_browser_version)

set_define("BASE_BROWSER_VERSION_QUOTED", base_browser_version_quoted)





# Please do not add configure checks from here on.

mozconfig-linux-x86_64-dev

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ 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

mozconfig-macos-x86_64→mozconfig-macos

+0 −0

File moved.

View file