Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 368103 Make mailnews/import build into only one shared library for SeaMonkey. r=mnyromyr+mscott,sr=Neil

Browse Source
This commit is contained in:
bugzilla%standard8.demon.co.uk 2007-02-14 16:56:29 +00:00
parent e2e604d1a7
commit 0b00e5820d
15 changed files with 34 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mailnews/import/Makefile.in
View File

@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk
MODULE = import
PACKAGE_FILE = msgimport.pkg
PACKAGE_VARS += MOZ_STATIC_MAIL_BUILD
DIRS = public src text comm4x
@ -60,8 +59,6 @@ DIRS += oexpress outlook
endif
endif
ifdef MOZ_STATIC_MAIL_BUILD
DIRS += build
endif
include $(topsrcdir)/config/rules.mk

12
mailnews/import/build/Makefile.in
View File

@ -124,9 +124,19 @@ LOCAL_INCLUDES += -I$(srcdir)/../oexpress \
endif
endif
ifdef MOZ_STATIC_MAIL_BUILD
EXTRA_DSO_LDOPTS += ../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
else
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = msgbsutl
else
EXTRA_DSO_LIBS = msgbaseutil
endif # ifeq
endif # MOZ_STATIC_MAIL_BUILD
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) \
$(EXTRA_DSO_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZ_COMPONENT_LIBS) \

43
mailnews/import/comm4x/src/Makefile.in
View File

@ -43,28 +43,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = impComm4xMail
ifndef MOZ_STATIC_MAIL_BUILD
LIBRARY_NAME = impComm4xMail
# don't define SHORT_LIBNAME on WINNT
# see bug # 141438
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = imp4Mail
endif
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsComm4xMailImportModule
else
LIBRARY_NAME = imp4mail_s
endif
PACKAGE_FILE = importcomm4x.pkg
MOZILLA_INTERNAL_API = 1
@ -87,32 +67,9 @@ CPPSRCS = \
nsComm4xProfile.cpp \
$(NULL)
ifndef MOZ_STATIC_MAIL_BUILD
CPPSRCS += nsComm4xMailFactory.cpp
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = msgbsutl
else
EXTRA_DSO_LIBS = msgbaseutil
endif
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_XPCOM_OBSOLETE_LIBS) \
$(NULL)
else
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
endif
include $(topsrcdir)/config/rules.mk
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))

39
mailnews/import/eudora/src/Makefile.in
View File

@ -44,20 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = impEudra
PACKAGE_FILE = importeudora.pkg
ifndef MOZ_STATIC_MAIL_BUILD
LIBRARY_NAME = impEudra
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsEudoraImportModule
else
LIBRARY_NAME = impEudra_s
endif
META_COMPONENT = mail
MOZILLA_INTERNAL_API = 1
@ -99,33 +86,7 @@ REQUIRES += macmorefiles
CPPSRCS += nsEudoraMac.cpp
endif
ifndef MOZ_STATIC_MAIL_BUILD
CPPSRCS += nsEudoraFactory.cpp
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = msgbsutl
else
EXTRA_DSO_LIBS = msgbaseutil
endif
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_XPCOM_OBSOLETE_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif
else
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
endif
include $(topsrcdir)/config/rules.mk

5
mailnews/import/msgimport.pkg
View File

@ -1,6 +1 @@
[xpfe-mailnews]
#if !MOZ_STATIC_MAIL_BUILD
dist/bin/components/@DLLP@import@DLLS@
#endif
!xpt dist/bin/components/import.xpt

32
mailnews/import/oexpress/Makefile.in
View File

@ -44,18 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = importOE
PACKAGE_FILE = importoe.pkg
ifndef MOZ_STATIC_MAIL_BUILD
LIBRARY_NAME = importOE
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsOEImport
else
LIBRARY_NAME = importOE_s
endif
MOZILLA_INTERNAL_API = 1
META_COMPONENT = mail
@ -89,28 +78,7 @@ CPPSRCS = \
nsOEStringBundle.cpp \
$(NULL)
ifndef MOZ_STATIC_MAIL_BUILD
CPPSRCS += nsOEFactory.cpp
ifdef USE_SHORT_LIBNAME
EXTRA_DSO_LIBS = msgbsutl
else
EXTRA_DSO_LIBS = msgbaseutil
endif
EXTRA_DSO_LDOPTS = \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_XPCOM_OBSOLETE_LIBS) \
$(NULL)
else
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
endif
include $(topsrcdir)/config/rules.mk

33
mailnews/import/outlook/src/Makefile.in
View File

@ -44,18 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = impOutlk
PACKAGE_FILE = importoutlook.pkg
ifndef MOZ_STATIC_MAIL_BUILD
LIBRARY_NAME = impOutlk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsOutlookImport
else
LIBRARY_NAME = impOutlk_s
endif
META_COMPONENT = mail
MOZILLA_INTERNAL_API = 1
@ -93,29 +82,7 @@ CPPSRCS = \
nsOutlookCompose.cpp \
$(NULL)
ifndef MOZ_STATIC_MAIL_BUILD
CPPSRCS += nsOutlookFactory.cpp
ifdef USE_SHORT_LIBNAME
EXTRA_DSO_LIBS = msgbsutl
else
EXTRA_DSO_LIBS = msgbaseutil
endif
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_XPCOM_OBSOLETE_LIBS) \
$(NULL)
else
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
endif
include $(topsrcdir)/config/rules.mk

31
mailnews/import/src/Makefile.in
View File

@ -43,17 +43,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = import
ifndef MOZ_STATIC_MAIL_BUILD
LIBRARY_NAME = import
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsImportServiceModule
else
LIBRARY_NAME = import_s
endif
META_COMPONENT = mail
MOZILLA_INTERNAL_API = 1
@ -92,28 +82,7 @@ CPPSRCS = \
nsImportFieldMap.cpp \
$(NULL)
ifndef MOZ_STATIC_MAIL_BUILD
CPPSRCS += nsImportFactory.cpp
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = msgbsutl
else
EXTRA_DSO_LIBS = msgbaseutil
endif
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_XPCOM_OBSOLETE_LIBS) \
$(NULL)
else
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
endif
include $(topsrcdir)/config/rules.mk

42
mailnews/import/text/src/Makefile.in
View File

@ -45,30 +45,21 @@ include $(DEPTH)/config/autoconf.mk
MODULE = impText
PACKAGE_FILE = importtext.pkg
ifndef MOZ_STATIC_MAIL_BUILD
LIBRARY_NAME = impText
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsTextImportModule
else
LIBRARY_NAME = imptext_s
endif
META_COMPONENT = mail
MOZILLA_INTERNAL_API = 1
REQUIRES = xpcom \
xpcom_obsolete \
string \
import \
intl \
necko \
addrbook \
pref \
mork \
$(NULL)
REQUIRES = xpcom \
xpcom_obsolete \
string \
import \
intl \
necko \
addrbook \
pref \
mork \
$(NULL)
CPPSRCS = \
nsTextStringBundle.cpp \
@ -76,20 +67,9 @@ CPPSRCS = \
nsTextAddress.cpp \
$(NULL)
ifndef MOZ_STATIC_MAIL_BUILD
CPPSRCS += nsTextFactory.cpp
EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_XPCOM_OBSOLETE_LIBS) \
$(NULL)
else
LOCAL_INCLUDES += -I$(srcdir)/../../src
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
endif
include $(topsrcdir)/config/rules.mk

2
xpinstall/packager/os2/mail.jst
View File

@ -22,6 +22,8 @@ function upgradeCleanup()
deleteThisFile("Components", "msgnews.xpt");
deleteThisFile("Components", "msgsearch.xpt");
deleteThisFile("Components", "msgsmime.xpt");
deleteThisFile("Components", "impText.dll");
deleteThisFile("Components", "imp4Mail.dll");
}
// main

6
xpinstall/packager/packages-os2
View File

@ -456,12 +456,6 @@ bin/components/vcard.dll
bin/components/smimestb.dll
bin/components/import.dll
bin/components/import.xpt
;bin/components/importOE.dll
;bin/components/impOutlk.dll
;bin/components/impEudra.dll
bin/components/impText.dll
;bin/components/impComm4xMail.dll
bin/components/imp4Mail.dll
bin/components/impComm4xMail.xpt
bin/components/nsAbLDAPAttributeMap.js
bin/components/nsLDAPPrefsService.js

2
xpinstall/packager/packages-unix
View File

@ -450,8 +450,6 @@ bin/components/libmsgnews.so
bin/components/libvcard.so
bin/components/libsmimestb.so
bin/components/libimport.so
bin/components/libimpText.so
bin/components/libimpComm4xMail.so
bin/components/mailnews.xpt
bin/components/mime.xpt
bin/components/msgbase.xpt

5
xpinstall/packager/packages-win
View File

@ -313,11 +313,6 @@ bin\components\vcard.dll
bin\components\smimestb.dll
bin\components\import.dll
bin\components\import.xpt
bin\components\importOE.dll
bin\components\impOutlk.dll
bin\components\impEudra.dll
bin\components\impText.dll
bin\components\impComm4xMail.dll
bin\components\impComm4xMail.xpt
bin\components\nsAbLDAPAttributeMap.js
bin\components\nsLDAPPrefsService.js

4
xpinstall/packager/unix/mail.jst
View File

@ -3,6 +3,10 @@ function upgradeCleanup()
// Obsolete files from Netscape 6.0 and Netscape 6.01 that
// need to be cleaned up.
deleteThisFile("Components", "libsigned.so");
// Obsolete files from SeaMonkey 1.1 that need to be cleaned up
deleteThisFile("Components", "impComm4xMail.xpt");
deleteThisFile("Components", "impComm4xMail.so");
deleteThisFile("Components", "impText.so");
}
var srDest = $SpaceRequired$;

6
xpinstall/packager/windows/mail.jst
View File

@ -358,6 +358,12 @@ function upgradeCleanup()
deleteThisFile("Components", "smimestb.dll");
deleteThisFile("Components", "nsMapiRegistry.dll");
deleteThisFile("Components", "absyncsv.dll");
// Obsolete files from SeaMonkey 1.1 that need to be cleaned up
deleteThisFile("Components", "importOE.dll");
deleteThisFile("Components", "impOutlk.dll");
deleteThisFile("Components", "impEudra.dll");
deleteThisFile("Components", "impText.dll");
deleteThisFile("Components", "impComm4xMail.dll");
}
function updateWinIni()