зеркало из https://github.com/mozilla/gecko-dev.git
Profile sharing - enable in build, add autoconf switches, pull ipc module. bug=202474, r=seawood/a=asa
This commit is contained in:
Родитель
bcf84a2a3b
Коммит
ed2fb2f25d
|
@ -167,6 +167,10 @@ ifdef MOZ_ENABLE_GTK2
|
|||
tier_9_dirs += widget/src/gtkxtbin
|
||||
endif
|
||||
|
||||
ifdef MOZ_IPCD
|
||||
tier_9_dirs += ipc/ipcd
|
||||
endif
|
||||
|
||||
tier_9_dirs += \
|
||||
modules/libutil \
|
||||
netwerk \
|
||||
|
|
|
@ -916,6 +916,40 @@ if [ "$MOZ_MAIL_NEWS" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
MAKEFILES_ipcd="
|
||||
ipc/ipcd/Makefile
|
||||
ipc/ipcd/daemon/public/Makefile
|
||||
ipc/ipcd/daemon/src/Makefile
|
||||
ipc/ipcd/client/public/Makefile
|
||||
ipc/ipcd/client/src/Makefile
|
||||
ipc/ipcd/shared/src/Makefile
|
||||
ipc/ipcd/test/Makefile
|
||||
ipc/ipcd/test/module/Makefile
|
||||
ipc/ipcd/extensions/Makefile
|
||||
ipc/ipcd/extensions/lock/Makefile
|
||||
ipc/ipcd/extensions/lock/public/Makefile
|
||||
ipc/ipcd/extensions/lock/src/Makefile
|
||||
ipc/ipcd/extensions/lock/src/module/Makefile
|
||||
ipc/ipcd/util/Makefile
|
||||
ipc/ipcd/util/public/Makefile
|
||||
ipc/ipcd/util/src/Makefile
|
||||
"
|
||||
|
||||
MAKEFILES_transmngr="
|
||||
ipc/ipcd/extensions/transmngr/Makefile
|
||||
ipc/ipcd/extensions/transmngr/public/Makefile
|
||||
ipc/ipcd/extensions/transmngr/src/Makefile
|
||||
ipc/ipcd/extensions/transmngr/build/Makefile
|
||||
ipc/ipcd/extensions/transmngr/test/Makefile
|
||||
ipc/ipcd/extensions/transmngr/common/Makefile
|
||||
ipc/ipcd/extensions/transmngr/module/Makefile
|
||||
"
|
||||
|
||||
MAKEFILES_profilesharingsetup="
|
||||
embedding/components/profilesharingsetup/Makefile
|
||||
embedding/components/profilesharingsetup/public/Makefile
|
||||
embedding/components/profilesharingsetup/src/Makefile
|
||||
"
|
||||
|
||||
MAKEFILES_libpr0n="
|
||||
modules/libpr0n/Makefile
|
||||
|
@ -1317,6 +1351,15 @@ if test -n "$MOZ_THUNDERBIRD"; then
|
|||
add_makefiles "$MAKEFILES_thunderbird"
|
||||
fi
|
||||
|
||||
if test -n "$MOZ_IPCD"; then
|
||||
add_makefiles "$MAKEFILES_ipcd"
|
||||
fi
|
||||
|
||||
if test -n "$MOZ_PROFILESHARING"; then
|
||||
add_makefiles "$MAKEFILES_transmngr"
|
||||
add_makefiles "$MAKEFILES_profilesharingsetup"
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
# Standalone modules go here
|
||||
|
|
15
client.mk
15
client.mk
|
@ -59,6 +59,7 @@ NSS_CO_TAG = NSS_CLIENT_TAG
|
|||
LDAPCSDK_CO_TAG = ldapcsdk_50_client_branch
|
||||
ACCESSIBLE_CO_TAG =
|
||||
IMGLIB2_CO_TAG =
|
||||
IPC_CO_TAG = IPC_BRANCH_20030304
|
||||
BUILD_MODULES = all
|
||||
|
||||
#######################################################################
|
||||
|
@ -280,6 +281,19 @@ ifdef IMGLIB2_CO_TAG
|
|||
endif
|
||||
CVSCO_IMGLIB2 = $(CVS) $(CVS_FLAGS) co $(IMGLIB2_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(IMGLIB2_CO_MODULE)
|
||||
|
||||
####################################
|
||||
# CVS defines for ipc module
|
||||
#
|
||||
IPC_CO_MODULE = mozilla/ipc/ipcd
|
||||
IPC_CO_FLAGS := -P
|
||||
ifdef MOZ_CO_FLAGS
|
||||
IPC_CO_FLAGS := $(MOZ_CO_FLAGS)
|
||||
endif
|
||||
ifdef IPC_CO_TAG
|
||||
IPC_CO_FLAGS := $(IPC_CO_FLAGS) -r $(IPC_CO_TAG)
|
||||
endif
|
||||
CVSCO_IPC = $(CVS) $(CVS_FLAGS) co $(IPC_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(IPC_CO_MODULE)
|
||||
|
||||
####################################
|
||||
# CVS defines for Calendar
|
||||
#
|
||||
|
@ -467,6 +481,7 @@ real_checkout:
|
|||
cvs_co $(CVSCO_LDAPCSDK) && \
|
||||
cvs_co $(CVSCO_ACCESSIBLE) && \
|
||||
cvs_co $(CVSCO_IMGLIB2) && \
|
||||
cvs_co $(CVSCO_IPC) && \
|
||||
cvs_co $(CVSCO_CALENDAR) && \
|
||||
$(CHECKOUT_LIBART) && \
|
||||
$(CHECKOUT_MOZTOOLKIT) && \
|
||||
|
|
|
@ -101,6 +101,8 @@ MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
|
|||
MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
|
||||
XPC_IDISPATCH_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
|
||||
MOZ_XPFE_COMPONENTS = @MOZ_XPFE_COMPONENTS@
|
||||
MOZ_IPCD = @MOZ_IPCD@
|
||||
MOZ_PROFILESHARING = @MOZ_PROFILESHARING@
|
||||
|
||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@
|
||||
MOZ_COMPONENT_NSPR_LIBS=@MOZ_COMPONENT_NSPR_LIBS@
|
||||
|
|
Загрузка…
Ссылка в новой задаче