Bug 1782837 - Add `MOZ_NOTIFICATION_SERVER`; don't build notification server under MinGW. r=firefox-build-system-reviewers,glandium

Differential Revision: https://phabricator.services.mozilla.com/D154467
This commit is contained in:
Nick Alexander 2022-08-18 16:31:09 +00:00
Родитель 581c22e956
Коммит 98a5c8dac8
6 изменённых файлов: 28 добавлений и 2 удалений

Просмотреть файл

@ -32,6 +32,7 @@ ac_add_options --disable-webrtc # Bug 1393901
ac_add_options --disable-geckodriver # Bug 1489320
ac_add_options --disable-update-agent # Bug 1561797
ac_add_options --disable-default-browser-agent # WinToast does not build on mingw
ac_add_options --disable-notification-server # Toast notifications don't build on mingw.
# Find our toolchain
HOST_CC="$MOZ_FETCHES_DIR/clang/bin/clang"

Просмотреть файл

@ -32,6 +32,7 @@ ac_add_options --disable-webrtc # Bug 1393901
ac_add_options --disable-geckodriver # Bug 1489320
ac_add_options --disable-update-agent # Bug 1561797
ac_add_options --disable-default-browser-agent # WinToast does not build on mingw
ac_add_options --disable-notification-server # Toast notifications don't build on mingw.
# Find our toolchain
HOST_CC="$MOZ_FETCHES_DIR/clang/bin/clang"

Просмотреть файл

@ -98,6 +98,10 @@ ifdef MOZ_DEFAULT_BROWSER_AGENT
DEFINES += -DMOZ_DEFAULT_BROWSER_AGENT=1
endif
ifdef MOZ_NOTIFICATION_SERVER
DEFINES += -DMOZ_NOTIFICATION_SERVER=1
endif
ifdef MOZ_BACKGROUNDTASKS
DEFINES += -DMOZ_BACKGROUNDTASKS=1
endif

Просмотреть файл

@ -421,7 +421,7 @@ bin/libfreebl_64int_3.so
; [ Notification COM Server ]
;
#if defined(XP_WIN)
#if defined(MOZ_NOTIFICATION_SERVER)
@BINPATH@/@DLL_PREFIX@notificationserver@DLL_SUFFIX@
#endif

Просмотреть файл

@ -134,3 +134,21 @@ def default_agent_flag(enabled):
set_config("MOZ_DEFAULT_BROWSER_AGENT", default_agent_flag)
# Enable or disable the notification server, which allows Windows native
# notifications to persist when the application is not running and relaunch as
# necessary.
# ==============================================================================
@depends(target, build_project)
def notification_server_default(target, build_project):
return target.os == "WINNT" and build_project == "browser"
option(
"--disable-notification-server",
when=notification_server_default,
help="Disable building the notification server",
)
set_config("MOZ_NOTIFICATION_SERVER", True, when="--enable-notification-server")

Просмотреть файл

@ -25,7 +25,9 @@ DIRS += [
]
if CONFIG["OS_ARCH"] == "WINNT":
DIRS += ["mozapps/notificationserver"]
if CONFIG["MOZ_NOTIFICATION_SERVER"]:
DIRS += ["mozapps/notificationserver"]
if CONFIG["MOZ_DEFAULT_BROWSER_AGENT"]:
DIRS += ["mozapps/defaultagent"]