зеркало из https://github.com/mozilla/gecko-dev.git
Fix our libical integration:
Pull libical & calendar by default. RForce libical libs to be always dynamic & prefix them with moz Bug $178798 r=blizzard
This commit is contained in:
seawood%netscape.com
Родитель
b6639aa6b3
Коммит
bab96f1a37
|
|
@ -239,7 +239,7 @@ tier_97_dirs += mailnews
|
|||
endif
|
||||
|
||||
ifdef MOZ_CALENDAR
|
||||
tier_98_dirs += calendar
|
||||
tier_98_dirs += other-licenses/libical calendar
|
||||
endif
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1183,6 +1183,10 @@ MAKEFILES_calendar="
|
|||
calendar/Makefile
|
||||
calendar/libxpical/Makefile
|
||||
calendar/resources/Makefile
|
||||
other-licenses/libical/Makefile
|
||||
other-licenses/libical/src/Makefile
|
||||
other-licenses/libical/src/libical/Makefile
|
||||
other-licenses/libical/src/libicalss/Makefile
|
||||
"
|
||||
|
||||
add_makefiles "
|
||||
|
|
|
|||
|
|
@ -41,14 +41,8 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MOZ_STATIC_COMPONENT_LIBS=
|
||||
BUILD_STATIC_LIBS=
|
||||
BUILD_SHARED_LIBS=1
|
||||
|
||||
MODULE = calendar
|
||||
#XPIDL_MODULE = calendar
|
||||
LIBRARY_NAME = xpical
|
||||
SHORT_LIBNAME = xpical
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = oeICalModule
|
||||
|
|
@ -72,17 +66,18 @@ CPPSRCS = \
|
|||
oeICalImpl.cpp \
|
||||
oeICalContainerImpl.cpp \
|
||||
oeDateTimeImpl.cpp \
|
||||
oeICalStartupHandler.cpp \
|
||||
oeICalStartupHandler.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) -lical -licalss
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(LIBS_DIR) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
-lmozicalss \
|
||||
-lmozical \
|
||||
$(NULL)
|
||||
|
||||
OS_COMPILE_CXXFLAGS += -DICAL_DEBUG
|
||||
DEFINES += -DICAL_DEBUG
|
||||
#-DICAL_DEBUG_ALL
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
DEFINES += -DWIN32_LEAN_AND_MEAN
|
||||
endif
|
||||
|
||||
|
|
|
|||
25
client.mk
25
client.mk
|
|
@ -280,6 +280,11 @@ ifdef IMGLIB2_CO_TAG
|
|||
endif
|
||||
CVSCO_IMGLIB2 = $(CVS) $(CVS_FLAGS) co $(IMGLIB2_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(IMGLIB2_CO_MODULE)
|
||||
|
||||
####################################
|
||||
# CVS defines for Calendar
|
||||
#
|
||||
CVSCO_CALENDAR := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/calendar mozilla/other-licenses/libical
|
||||
|
||||
####################################
|
||||
# CVS defines for standalone modules
|
||||
#
|
||||
|
|
@ -310,6 +315,9 @@ endif
|
|||
ifeq (,$(filter modules/libpr0n, $(BUILD_MODULE_CVS)))
|
||||
CVSCO_IMGLIB2 :=
|
||||
endif
|
||||
ifeq (,$(filter calendar other-licenses/libical, $(BUILD_MODULE_CVS)))
|
||||
CVSCO_CALENDAR :=
|
||||
endif
|
||||
endif
|
||||
|
||||
####################################
|
||||
|
|
@ -333,19 +341,6 @@ CHECKOUT_LIBART := true
|
|||
FASTUPDATE_LIBART := true
|
||||
endif
|
||||
|
||||
####################################
|
||||
# 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
|
||||
|
||||
####################################
|
||||
# CVS defines for Phoenix (pulled and built if MOZ_PHOENIX is set)
|
||||
#
|
||||
|
|
@ -435,7 +430,7 @@ real_checkout:
|
|||
cvs_co $(CVSCO_LDAPCSDK) && \
|
||||
cvs_co $(CVSCO_ACCESSIBLE) && \
|
||||
cvs_co $(CVSCO_IMGLIB2) && \
|
||||
$(CHECKOUT_CALENDAR) && \
|
||||
cvs_co $(CVSCO_CALENDAR) && \
|
||||
$(CHECKOUT_LIBART) && \
|
||||
$(CHECKOUT_PHOENIX) && \
|
||||
$(CHECKOUT_CODESIGHS) && \
|
||||
|
|
@ -496,7 +491,7 @@ real_fast-update:
|
|||
fast_update $(CVSCO_LDAPCSDK) && \
|
||||
fast_update $(CVSCO_ACCESSIBLE) && \
|
||||
fast_update $(CVSCO_IMGLIB2) && \
|
||||
$(FASTUPDATE_CALENDAR) && \
|
||||
fast_update $(CVSCO_CALENDAR) && \
|
||||
$(FASTUPDATE_LIBART) && \
|
||||
$(FASTUPDATE_PHOENIX) && \
|
||||
$(FASTUPDATE_CODESIGHS) && \
|
||||
|
|
|
|||
14
configure.in
14
configure.in
|
|
@ -3187,10 +3187,10 @@ MOZ_ARG_HEADER(Components and Features)
|
|||
dnl =========================================================
|
||||
dnl = Calendar client
|
||||
dnl =========================================================
|
||||
MOZ_CALENDAR=
|
||||
MOZ_ARG_ENABLE_BOOL(calendar,
|
||||
[ --enable-calendar Enable building of the calendar client],
|
||||
MOZ_CALENDAR=1 )
|
||||
MOZ_CALENDAR=1,
|
||||
MOZ_CALENDAR= )
|
||||
AC_SUBST(MOZ_CALENDAR)
|
||||
|
||||
dnl =========================================================
|
||||
|
|
@ -3210,16 +3210,6 @@ MOZ_ARG_DISABLE_BOOL(ldap,
|
|||
[ --disable-ldap Disable LDAP support],
|
||||
MOZ_LDAP_XPCOM=)
|
||||
|
||||
dnl =========================================================
|
||||
dnl = Calendar
|
||||
dnl =========================================================
|
||||
if test "$MOZ_CALENDAR"; then
|
||||
AC_CHECK_LIB(ical, icalproperty_new_location, [_dummy=foo],
|
||||
AC_MSG_ERROR([Calendar requires libical]))
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_CALENDAR)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Phoenix
|
||||
dnl ========================================================
|
||||
|
|
|
|||
|
|
@ -29,18 +29,17 @@ include $(DEPTH)/config/autoconf.mk
|
|||
include $(srcdir)/objs.mk
|
||||
|
||||
MODULE = ical
|
||||
LIBRARY_NAME=ical
|
||||
LIBRARY_NAME=mozical
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
MAPFILE = $(LIBRARY_NAME).map
|
||||
DEFFILE = $(srcdir)/$(LIBRARY_NAME).def
|
||||
LIBRARY_NAME = ical
|
||||
DEFFILE = $(srcdir)/ical.def
|
||||
endif
|
||||
|
||||
CSRCS = $(ICAL_SRC_LCSRCS)
|
||||
|
||||
EXPORTS = $(ICAL_SRC_LEXPORTS)
|
||||
FORCE_STATIC_LIB=1
|
||||
FORCE_SHARED_LIB=1
|
||||
GARBAGE += ical.h $(BUILT_COMBINEDHEADERS) $(BUILT_SOURCES)
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
GARBAGE += $(LIBRARY_NAME).ilk
|
||||
|
|
@ -174,7 +173,7 @@ icalrestriction.c: $(RESTRICTIONDEPS) Makefile
|
|||
$(PERL) $(ICALSCRIPTS)/mkrestrictiontable.pl -i $(srcdir)/icalrestriction.c.in \
|
||||
$(DESIGNDATA)/restrictions.csv > icalrestriction.c
|
||||
|
||||
ifeq ($(OS_ARCH),BeOS)
|
||||
ifneq (,$(filter BeOS Darwin,$(OS_ARCH)))
|
||||
DEFINES += -D__USE_BSD=1
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
DESCRIPTION:
|
||||
|
||||
$Id: icallangbind.c,v 1.7 2002/11/06 21:22:28 mostafah%oeone.com Exp $
|
||||
$Id: icallangbind.c,v 1.8 2002/12/11 04:14:41 seawood%netscape.com Exp $
|
||||
$Locker: $
|
||||
|
||||
(C) COPYRIGHT 1999 Eric Busboom
|
||||
|
|
@ -26,6 +26,8 @@
|
|||
#ifdef XP_MAC
|
||||
#include <extras.h> /* for malloc */
|
||||
#include <stdlib.h> /* for free */
|
||||
#elif defined(XP_MACOSX)
|
||||
#include <stdlib.h>
|
||||
#else
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -35,12 +35,14 @@ include $(DEPTH)/config/autoconf.mk
|
|||
include $(srcdir)/objs.mk
|
||||
|
||||
MODULE = icalss
|
||||
LIBRARY_NAME=icalss
|
||||
LIBRARY_NAME=mozicalss
|
||||
ifneq ($(OS_ARCH),WINNT)
|
||||
SHORT_LIBNAME=mozicals
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
MAPFILE = $(LIBRARY_NAME).map
|
||||
DEFFILE = $(srcdir)/$(LIBRARY_NAME).def
|
||||
LIBRARY_NAME = icalss
|
||||
DEFFILE = $(srcdir)/icalss.def
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
|
|
@ -50,10 +52,10 @@ endif
|
|||
CSRCS = $(ICALSS_SRC_LCSRCS)
|
||||
|
||||
EXPORTS = $(ICALSS_SRC_LEXPORTS)
|
||||
FORCE_STATIC_LIB=1
|
||||
FORCE_SHARED_LIB=1
|
||||
LOCAL_INCLUDES = -I$(srcdir) -I$(srcdir)/../libical
|
||||
REQUIRES = ical
|
||||
EXTRA_DSO_LIBS = ical
|
||||
EXTRA_DSO_LIBS = mozical
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(LIBS_DIR) \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче