зеркало из https://github.com/mozilla/pjs.git
Adding support for building calendar by having MOZ_CALENDAR=1 set. r=cls.
This commit is contained in:
Родитель
7283be27a9
Коммит
f1c727ffc4
|
@ -170,6 +170,10 @@ ifneq (,$(MOZ_STATIC_COMPONENTS)$(MOZ_META_COMPONENTS))
|
|||
DIRS += modules/staticmod
|
||||
endif
|
||||
|
||||
ifdef MOZ_CALENDAR
|
||||
DIRS += calendar
|
||||
endif
|
||||
|
||||
DIRS += xpfe/bootstrap
|
||||
|
||||
endif # BUILD_MODULES == all
|
||||
|
|
|
@ -1066,6 +1066,12 @@ if [ "$BUILD_MODULES" = "all" ]; then
|
|||
|
||||
MAKEFILES_themes=`cat ${srcdir}/themes/makefiles`
|
||||
|
||||
MAKEFILES_calendar="
|
||||
calendar/Makefile
|
||||
calendar/libxpical/Makefile
|
||||
calendar/resources/Makefile
|
||||
"
|
||||
|
||||
add_makefiles "
|
||||
$MAKEFILES_caps
|
||||
$MAKEFILES_db
|
||||
|
@ -1128,6 +1134,10 @@ if test -n "$MOZ_PSM"; then
|
|||
add_makefiles "$MAKEFILES_psm2"
|
||||
fi
|
||||
|
||||
if test -n "$MOZ_CALENDAR"; then
|
||||
add_makefiles "$MAKEFILES_calendar"
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
# Standalone modules go here
|
||||
|
|
15
client.mk
15
client.mk
|
@ -338,6 +338,19 @@ ifeq ($(MOZ_CO_MODULE),)
|
|||
endif
|
||||
CVSCO_SEAMONKEY := $(CVSCO) $(CVS_CO_DATE_FLAGS) $(MOZ_CO_MODULE)
|
||||
|
||||
####################################
|
||||
# CVS defines for Calendar (pulled and built if MOZ_CALENDAR is set)
|
||||
#
|
||||
CVSCO_CALENDAR := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/calendar
|
||||
|
||||
ifdef MOZ_CALENDAR
|
||||
FASTUPDATE_CALENDAR := fast_update $(CVSCO_CALENDAR)
|
||||
CHECKOUT_CALENDAR := cvs_co $(CVSCO_CALENDAR)
|
||||
else
|
||||
CHECKOUT_CALENDAR := true
|
||||
FASTUPDATE_CALENDAR := true
|
||||
endif
|
||||
|
||||
#######################################################################
|
||||
# Rules
|
||||
#
|
||||
|
@ -401,6 +414,7 @@ real_checkout:
|
|||
cvs_co $(CVSCO_GFX2) && \
|
||||
cvs_co $(CVSCO_IMGLIB2) && \
|
||||
cvs_co $(CVSCO_SEAMONKEY) && \
|
||||
$(CHECKOUT_CALENDAR) && \
|
||||
cvs_co $(CVSCO_NOSUBDIRS)
|
||||
@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
|
||||
# @: Check the log for conflicts. ;
|
||||
|
@ -457,6 +471,7 @@ real_fast-update:
|
|||
fast_update $(CVSCO_GFX2) && \
|
||||
fast_update $(CVSCO_IMGLIB2) && \
|
||||
fast_update $(CVSCO_SEAMONKEY) && \
|
||||
$(FASTUPDATE_CALENDAR) && \
|
||||
fast_update $(CVSCO_NOSUBDIRS)
|
||||
@echo "fast_update finish: "`date` | tee -a $(CVSCO_LOGFILE)
|
||||
# @: Check the log for conflicts. ;
|
||||
|
|
Загрузка…
Ссылка в новой задаче