Verified Commit e68b2a5c 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

Added --with-base-browser-version
parent f52818cd

moz.configure

+31 −8
Original line number Diff line number Diff line
@@ -1016,14 +1016,6 @@ 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"

)



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

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





option(

    "--with-relative-data-dir",
@@ -1044,6 +1036,37 @@ def relative_data_dir(value, target): 
set_define("RELATIVE_DATA_DIR", relative_data_dir)





option(

    "--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_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.



# Fallthrough to autoconf-based configure

mozconfig-linux-x86_64-dev

+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ ac_add_options --disable-strip 
ac_add_options --disable-install-strip



ac_add_options --disable-tor-browser-update

ac_add_options --with-base-browser-version=dev-build

mozconfig-macos-x86_64→mozconfig-macos

+0 −0

File moved.

View file

toolkit/modules/AppConstants.jsm

+2 −0
Original line number Diff line number Diff line
@@ -361,6 +361,8 @@ this.AppConstants = Object.freeze({ 
  MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",

  ANDROID_PACKAGE_NAME: "@ANDROID_PACKAGE_NAME@",



  BASE_BROWSER_VERSION: "@BASE_BROWSER_VERSION@",



  DEBUG_JS_MODULES: "@DEBUG_JS_MODULES@",



  MOZ_BING_API_CLIENTID: "@MOZ_BING_API_CLIENTID@",