mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Land STATIC_BUILD_20010612_BRANCH, which supports building mozilla with components statically linked into the executable, as well as 'meta modules' that combine components into uber-DLLs.

This commit is contained in:
waterson%netscape.com 2001-06-20 20:21:49 +00:00
Родитель a4cbf373fd
Коммит b74d6e1c8b
394 изменённых файлов: 17124 добавлений и 3271 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Makefile.in
Просмотреть файл

@ -163,7 +163,7 @@ endif
DIRS += l10n
ifdef MOZ_STATIC_COMPONENTS
ifneq (,$(MOZ_STATIC_COMPONENTS)$(MOZ_META_COMPONENTS))
DIRS += modules/staticmod
endif

1
accessible/build/Makefile.in
Просмотреть файл

@ -31,6 +31,7 @@ LIBRARY_NAME = accessibility
EXPORT_LIBRARY = 1
SHORT_LIBNAME = access
IS_COMPONENT = 1
MODULE_NAME = nsAccessibilityModule
REQUIRES = xpcom string dom
CPPSRCS = nsAccessibilityFactory.cpp

21
accessible/build/makefile.win
Просмотреть файл

@ -21,10 +21,8 @@
DEPTH=..\..
MODULE=accessibility
MAKE_OBJ_TYPE=DLL
DLLNAME=accessibility
DLL=.\$(OBJDIR)\$(DLLNAME).dll
LIBRARY_NAME=accessibility
MODULE_NAME=nsAccessibilityModule
CPP_OBJS=\
.\$(OBJDIR)\nsAccessibilityFactory.obj \
@ -32,16 +30,15 @@ CPP_OBJS=\
LINCS = $(LINCS) -I..\src # for implementation headers
SUB_LIBRARIES=\
$(DIST)\lib\accessibility_s.lib \
$(NULL)
LLIBS=\
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\accessibility_s.lib \
$(DIST)\lib\timer_s.lib \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\timer_s.lib \
$(DIST)\lib\gkgfx.lib \
$(LIBNSPR)
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib

2
caps/src/Makefile.in
Просмотреть файл

@ -30,6 +30,8 @@ MODULE = caps
LIBRARY_NAME = caps
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsSecurityManagerModule
REQUIRES = xpcom string pref js dom xpconnect necko jar widget plugin intl locale layout docshell uriloader gfx2 windowwatcher unicharutil
CPPSRCS = \

16
caps/src/makefile.win
Просмотреть файл

@ -41,10 +41,9 @@ DEPTH= ..\..
#//
#//------------------------------------------------------------------------
MAKE_OBJ_TYPE=DLL
DLLNAME=caps
DLL=.\$(OBJDIR)\$(DLLNAME).dll
MODULE=caps
LIBRARY_NAME=caps
MODULE_NAME=nsSecurityManagerModule
#//------------------------------------------------------------------------
#//
@ -101,7 +100,6 @@ LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\js3250.lib \
$(DIST)\lib\oji.lib \
$(DIST)\lib\zlib.lib \
$(NULL)
@ -113,11 +111,3 @@ LLIBS = \
#//------------------------------------------------------------------------
include <$(DEPTH)/config/rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
clobber::
rm -f $(DIST)\lib\$(DLLNAME).lib
rm -f $(DIST)\bin\components\$(DLLNAME).dll

2
client.mk
Просмотреть файл

@ -193,7 +193,7 @@ endif
####################################
# CVS defines for PSM
#
PSM_CO_MODULE= mozilla/security/manager
PSM_CO_MODULE= mozilla/security/manager mozilla/security/makefile.win
PSM_CO_FLAGS := -P -A
ifdef PSM_CO_TAG
PSM_CO_FLAGS := $(PSM_CO_FLAGS) -r $(PSM_CO_TAG)

3
config/autoconf.mk.in
Просмотреть файл

@ -73,6 +73,8 @@ NO_UNIX_ASYNC_DNS = @NO_UNIX_ASYNC_DNS@
BUILD_SHARED_LIBS = @BUILD_SHARED_LIBS@
BUILD_STATIC_LIBS = @BUILD_STATIC_LIBS@
MOZ_STATIC_COMPONENTS = @MOZ_STATIC_COMPONENTS@
MOZ_META_COMPONENTS = @MOZ_META_COMPONENTS@
MOZ_STATIC_COMPONENT_LIBS = @MOZ_STATIC_COMPONENT_LIBS@
ENABLE_TESTS = @ENABLE_TESTS@
IBMBIDI = @IBMBIDI@
BUILD_IDLC = @BUILD_IDLC@
@ -87,6 +89,7 @@ MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@
MOZ_COMPONENT_NSPR_LIBS=@MOZ_COMPONENT_NSPR_LIBS@
MOZ_COMPONENT_XPCOM_LIBS=@MOZ_COMPONENT_XPCOM_LIBS@
XPCOM_LIBS=@XPCOM_LIBS@
MOZ_REORDER=@MOZ_REORDER@
ClientWallet=1
CookieManagement=1

30
config/build-list.pl
Просмотреть файл

@ -25,18 +25,23 @@
# A generic script to add entries to a file
# if the entry does not already exist
#
# Usage: $0 <filename> <entry>
# Usage: $0 [-l] <filename> <entry>
#
# -l do not attempt flock the file.
use Fcntl qw(:DEFAULT :flock);
use Getopt::Std;
sub usage() {
print "$0 <filename> <entry>\n";
print "$0 [-l] <filename> <entry>\n";
exit(1);
}
if ($#ARGV != 1) {
usage();
}
$nofilelocks = 0;
getopts("l");
$nofilelocks = 1 if defined($::opt_l);
$file = shift;
$entry = shift;
@ -49,13 +54,18 @@ if ( ! -e "$file") {
# This needs to be atomic
open(OUT, ">>$file") || die ("$file: $!\n");
flock(OUT, LOCK_EX);
system("grep -c '^$entry\$' $file >/dev/null");
$exit_value = $? >> 8;
if ($exit_value) {
flock(OUT, LOCK_EX) unless $nofilelocks;
open(RES, "grep -c '^$entry\$' $file |") or $err = $!;
if ($err) {
flock(OUT,LOCK_UN) unless $nofilelocks;
die ("grep: $err\n");
}
chomp($val = <RES>);
close(RES);
if (!$val) {
print OUT "$entry\n";
}
flock(OUT, LOCK_UN);
flock(OUT, LOCK_UN) unless $nofilelocks;
close(OUT);
exit(0);

29
config/config.mak
Просмотреть файл

@ -156,6 +156,31 @@ CFLAGS=$(CFLAGS) -DNS_DISABLE_LOGGING
CFLAGS=$(CFLAGS) -DMOZ_LOGGING
!endif
FINAL_LINK_COMPS=$(DIST)\final-link-comps
FINAL_LINK_COMP_NAMES=$(DIST)\final-link-comp-names
FINAL_LINK_LIBS=$(DIST)\final-link-libs
!ifdef MOZ_STATIC_COMPONENT_LIBS
# Force _all_ exported methods to be |_declspec(dllexport)| when we're
# building them into the executable.
CFLAGS=$(CFLAGS) -D_IMPL_NS_APPSHELL
CFLAGS=$(CFLAGS) -D_IMPL_NS_COOKIE
CFLAGS=$(CFLAGS) -D_IMPL_NS_DOM
CFLAGS=$(CFLAGS) -D_IMPL_NS_GFX
CFLAGS=$(CFLAGS) -D_IMPL_NS_HTML
CFLAGS=$(CFLAGS) -D_IMPL_NS_HTMLPARS
CFLAGS=$(CFLAGS) -D_IMPL_NS_INTL
CFLAGS=$(CFLAGS) -D_IMPL_NS_LAYOUT
CFLAGS=$(CFLAGS) -D_IMPL_NS_MSG_BASE
CFLAGS=$(CFLAGS) -D_IMPL_NS_NET
CFLAGS=$(CFLAGS) -D_IMPL_NS_PICS
CFLAGS=$(CFLAGS) -D_IMPL_NS_PLUGIN
CFLAGS=$(CFLAGS) -D_IMPL_NS_RDF
CFLAGS=$(CFLAGS) -D_IMPL_NS_VIEW
CFLAGS=$(CFLAGS) -D_IMPL_NS_WEB
CFLAGS=$(CFLAGS) -D_IMPL_NS_WIDGET
!endif
#//-----------------------------------------------------------------------
#//
#// feature-specific configuration settings
@ -296,6 +321,10 @@ USE_IMG2=1
CFLAGS=$(CFLAGS) -DUSE_IMG2
#!endif
!ifdef MOZ_STATIC_COMPONENT_LIBS
CFLAGS=$(CFLAGS) -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT -DMOZ_STATIC_COMPONENT_LIBS
!endif
#//-----------------------------------------------------------------------
#//
#// build tools

71
config/config.mk
Просмотреть файл

@ -161,6 +161,29 @@ OS_CONFIG := $(OS_ARCH)$(OS_RELEASE)
FINAL_LINK_LIBS = $(DEPTH)/config/final-link-libs
FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps
FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names
#
# NSS libs needed for final link in static build
#
NSS_LIBS = \
$(DIST)/lib/libcrmf.$(LIB_SUFFIX) \
$(DIST)/lib/libssl3.$(LIB_SUFFIX) \
$(DIST)/lib/libnss3.$(LIB_SUFFIX) \
$(DIST)/lib/libssl3.$(LIB_SUFFIX) \
$(DIST)/lib/libpkcs12.$(LIB_SUFFIX) \
$(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \
$(DIST)/lib/libcerthi.$(LIB_SUFFIX) \
$(DIST)/lib/libpk11wrap.$(LIB_SUFFIX) \
$(DIST)/lib/libcryptohi.$(LIB_SUFFIX) \
$(DIST)/lib/libcerthi.$(LIB_SUFFIX) \
$(DIST)/lib/libpk11wrap.$(LIB_SUFFIX) \
$(DIST)/lib/libsoftoken.$(LIB_SUFFIX) \
$(DIST)/lib/libcertdb.$(LIB_SUFFIX) \
$(DIST)/lib/libfreebl_3.$(LIB_SUFFIX) \
$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
$(NULL)
# determine debug-related options
DEBUG_FLAGS :=
@ -238,6 +261,28 @@ endif
OS_CFLAGS += $(DEBUG_FLAGS)
OS_CXXFLAGS += $(DEBUG_FLAGS)
#
# -ffunction-sections is needed to reorder functions using a GNU ld
# script.
#
ifeq ($(MOZ_REORDER),1)
OS_CFLAGS += -ffunction-sections
OS_CXXFLAGS += -ffunction-sections
endif
#
# List known meta modules and their dependent libs
#
_ALL_META_COMPONENTS=mail crypto
MOZ_META_COMPONENTS_mail = nsMsgBaseModule IMAP_factory nsVCardModule mime_services nsMimeEmitterModule nsMsgNewsModule nsMsgComposeModule local_mail_services nsAbSyncModule nsImportServiceModule nsTextImportModule nsAbModule nsMsgDBModule
MOZ_META_COMPONENTS_mail_comps = mailnews msgimap mime mimeemitter msgnews msgcompose localmail absyncsvc import addrbook impText vcard msgdb #smime
MOZ_META_COMPONENTS_mail_libs = msgbaseutil
MOZ_META_COMPONENTS_crypto = PKI NSS
MOZ_META_COMPONENTS_crypto_comps = pippki pipnss
#
# Build using PIC by default
# Do not use PIC if not building a shared lib (see exceptions below)
#
@ -245,12 +290,32 @@ ifneq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB)$(FORCE_USE_PIC))
_ENABLE_PIC=1
endif
ifneq (,$(IS_COMPONENT))
ifneq (, $(findstring $(LIBRARY_NAME), $(MOZ_STATIC_COMPONENTS)))
DEFINES += -DNSGetModule=$(LIBRARY_NAME)_NSGetModule -DNSGetModule_components=$(LIBRARY_NAME)_NSGM_comps -DNSGetModule_components_count=$(LIBRARY_NAME)_NSGM_comp_count
# If module is going to be merged into the nsStaticModule,
# make sure that the entry points are translated and
# the module is built static.
ifdef IS_COMPONENT
ifneq (,$(MOZ_STATIC_COMPONENT_LIBS)$(findstring $(LIBRARY_NAME), $(MOZ_STATIC_COMPONENTS)))
ifdef MODULE_NAME
DEFINES += -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1
FORCE_STATIC_LIB=1
endif
endif
endif
# Determine if module being compiled is destined
# to be merged into a meta module in the future
ifneq (, $(findstring $(META_COMPONENT), $(MOZ_META_COMPONENTS)))
ifdef IS_COMPONENT
ifdef MODULE_NAME
DEFINES += -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1
endif
endif
EXPORT_LIBRARY=
FORCE_STATIC_LIB=1
_ENABLE_PIC=1
endif
#
# Disable PIC if necessary

25
config/dll.inc
Просмотреть файл

@ -72,25 +72,26 @@ $(DLL): $(OBJDIR) $(OBJS) $(LLIBS) $(RESFILE) $(DEFFILE) $(MISCDEP) makefile.win
#// Rule to build a 32-bit DLL using the DLL target
#//
#//------------------------------------------------------------------------
$(DLL): $(OBJDIR) $(OBJS) $(LLIBS) $(RESFILE) $(DEFFILE) $(MISCDEP) makefile.win $(DEPTH)\config\dll.inc
$(DLL): $(OBJDIR) $(OBJS) $(LLIBS) $(RESFILE) $(DEFFILE) $(EXTRA_LIBS_LIST_FILE) $(MISCDEP) makefile.win $(DEPTH)\config\dll.inc
echo +++ make: Creating DLL: $@
$(LD) @<<$(CFGFILE)
/NOLOGO /DLL /OUT:$@
/PDB:$(PDBFILE)
cat << $(EXTRA_LIBS_LIST_FILE) << >$(CFGFILE)
/NOLOGO /DLL /OUT:$@ /PDB:$(PDBFILE)
!ifdef DEFFILE
/DEF:$(DEFFILE)
/DEF:$(DEFFILE)
!endif
!ifdef MAPFILE
/MAP:$(MAPFILE)
/MAP:$(MAPFILE)
!endif
!if exist(win32.order) && !defined(MOZ_DEBUG) && defined(MOZ_COVERAGE)
/ORDER:@win32.order
/ORDER:@win32.order
!endif
$(LFLAGS)
$(OBJS)
$(RESFILE)
$(LLIBS) $(WIN_LIBS) $(OS_LIBS)
<<KEEP
$(LFLAGS)
$(OBJS)
$(RESFILE)
<<NOKEEP
$(LLIBS) $(WIN_LIBS) $(OS_LIBS)
<<NOKEEP
$(LD) @$(CFGFILE)
!endif
!endif # DLL && ! CONFIG_DLL_INC

26
config/exe.inc
Просмотреть файл

@ -69,23 +69,23 @@ $(PROGRAM):: $(OBJDIR) $(OBJS) $(LLIBS) $(RESFILE) $(DEFFILE) $(MISCDEP) makefil
#// Rule to build a 32-bit executable using the PROGRAM target
#//
#//------------------------------------------------------------------------
$(PROGRAM):: $(OBJDIR) $(OBJS) $(LLIBS) $(RESFILE) $(DEFFILE) $(MISCDEP) makefile.win $(DEPTH)\config\exe.inc
echo +++ make: Creating EXE: $@
$(LD) @<<$(CFGFILE)
/NOLOGO /OUT:$@
/PDB:$(PDBFILE)
$(PROGRAM):: $(OBJDIR) $(OBJS) $(LLIBS) $(RESFILE) $(DEFFILE) $(EXTRA_LIBS_LIST_FILE) $(MISCDEP) makefile.win $(DEPTH)\config\exe.inc
echo +++ make: Creating EXE: $@
cat << $(EXTRA_LIBS_LIST_FILE) << >$(CFGFILE)
/NOLOGO /OUT:$@ /PDB:$(PDBFILE)
!ifdef DEFFILE
/DEF:$(DEFFILE)
/DEF:$(DEFFILE)
!endif
!ifdef MAPFILE
/MAP:$(MAPFILE)
/MAP:$(MAPFILE)
!endif
$(LFLAGS)
$(OBJS)
$(RESFILE)
$(LLIBS) $(WIN_LIBS) $(OS_LIBS)
<<KEEP
$(LFLAGS)
$(OBJS)
$(RESFILE)
<<NOKEEP
$(LLIBS) $(WIN_LIBS) $(OS_LIBS)
<<NOKEEP
$(LD) @$(CFGFILE)
!endif
!endif # PROGRAM && ! CONFIG_EXE_INC

3
config/lib.inc
Просмотреть файл

@ -59,11 +59,12 @@ $(LIBRARY):: $(OBJDIR) $(OBJS) makefile.win $(DEPTH)\config\lib.inc
#// Rule to build a 32-bit Library
#//
#//------------------------------------------------------------------------
$(LIBRARY):: $(OBJDIR) $(OBJS) makefile.win $(DEPTH)\config\lib.inc
$(LIBRARY):: $(OBJDIR) $(OBJS) $(SUB_LIBRARIES) makefile.win $(DEPTH)\config\lib.inc
$(RM) $@ 2> NUL
$(AR) @<<$(CFGFILE)
-NOLOGO -OUT:$@
$(OBJS)
$(SUB_LIBRARIES)
<<
$(RANLIB) $@
!endif

66
config/mklinkscript.pl Normal file
Просмотреть файл

@ -0,0 +1,66 @@
#!perl
#
# This perl script takes an order file produced by the "order" program
# as input (specified on the command line) and outputs a script for
# GNU ld that orders functions in the specified order, assuming that
# all of the source files were compiled with the -ffunction-sections
# flag. Output goes to the file specified with "-o" flag.
use Getopt::Std;
getopts("o:");
if ($#ARGV != 0 || !defined $::opt_o) {
die("usage: mklinkscript -o script-file order-file");
}
$linkScript = $::opt_o;
$tmpFile = "$linkScript.tmp";
$orderFile = $ARGV[0];
open(LD, "ld --verbose|") || die("ld: $!");
#
# Initial output is to a temp file so that if we fail there won't be
# broken GNU ld script lying around to confuse the build and anyone
# trying to use it.
#
open(TMP, ">$tmpFile") || die("$tmpFile: $!");
sub PrintOrder {
my $line;
open(ORDER, $orderFile) || die("$orderFile: $!");
while ($line = <ORDER>) {
chomp $line;
print(TMP "*(.text.$line)\n");
}
close(ORDER);
}
$skip = 1;
LINE:
while ($line = <LD>) {
chomp $line;
if ($skip && $line =~ /^=*$/) {
$skip = 0;
next LINE;
} elsif (!$skip && $line =~ /^=*$/) {
last LINE;
}
if ($skip) {
next LINE;
}
print TMP "$line\n";
if ($line =~ /^[\s]*.text[\s]*:[\s]*$/) {
($line = <LD>) || die("Premature end of ld input");
print TMP "$line";
print TMP "*(.text)\n";
&PrintOrder();
<LD>; # Skip over *(.text)
}
}
close(LD);
close(TMP);
#
# Everything went OK, so create the real output file.
#
rename($tmpFile, $linkScript) || die("$linkScript: $!");

291
config/rules.mak
Просмотреть файл

@ -92,6 +92,139 @@ OBJS=$(OBJS) $(C_OBJS) $(CPP_OBJS)
include <$(DEPTH)/config/config.mak>
!if "$(WINOS)" == "WIN95"
_NO_FLOCK=-l
!else
_NO_FLOCK=
!endif
#//------------------------------------------------------------------------
#//
#// Definitions for building components. A ``component'' is a module
#// that has an NSGetModule entry point that can be called to enumerate
#// the XPCOM components contained in the module. A component can either
#// be built as a stand-alone DLL, or as a static library which can be
#// linked with other components to form a ``meta-component'' or included
#// in a final executable.
#//
#// MODULE_NAME
#// If set, indicates that we're building a ``component''. This value
#// should be set to the name of the generic module (as declared by
#// the NS_IMPL_NSGENERICMODULE macro; e.g., ``nsLayoutModule'').
#//
#// LIBRARY_NAME
#// For a component, the name of the library that will be generated;
#// e.g., ``gklayout''.
#//
#// META_COMPONENT
#// If set, the component is included in the packaging list for the
#// specified meta-component; if unset, the component is linked into
#// the final executable. This is only meaningful during a static
#// build.
#//
#// SUB_LIBRARIES
#// If the component is comprised of static libraries, then this
#// lists those libraries.
#//
#// LLIBS
#// Any extra library dependencies that are required when the component
#// is built as a DLL.
#//
#// When doing a ``dynamic build'', the component will be linked as a stand-
#// alone DLL which will be installed in the $(DIST)/bin/components directory.
#// No import library will be created.
#//
#// When doing a ``static build'', the component will be linked into a
#// static library which is installed in the $(DIST)/lib directory, and
#// either linked with the appropriate META_COMPONENT DLL, or the final
#// executable if no META_COMPONENT is set.
#//
#//------------------------------------------------------------------------
!if defined(MODULE_NAME)
# We're building a component
!if defined(EXPORT_LIBRARY)
!error "Can't define both MODULE_NAME and EXPORT_LIBRARY."
!endif
!if defined(MOZ_STATIC_COMPONENT_LIBS)
MAKE_OBJ_TYPE=$(NULL)
!if defined(META_COMPONENT)
META_LINK_COMPS=$(DIST)\$(META_COMPONENT)-link-comps
META_LINK_COMP_NAMES=$(DIST)\$(META_COMPONENT)-link-comp-names
!endif
LIBRARY=.\$(OBJDIR)\$(LIBRARY_NAME).lib
!else
# Build the component as a standalone DLL
MAKE_OBJ_TYPE=DLL
DLL=.\$(OBJDIR)\$(LIBRARY_NAME).dll
LLIBS=$(SUB_LIBRARIES) $(LLIBS)
!endif
!endif
#//------------------------------------------------------------------------
#//
#// Definitions for building top-level export libraries.
#//
#// EXPORT_LIBRARY
#// If set (typically to ``1''), indicates that we're building a
#// ``top-level export library''.
#//
#// LIBRARY_NAME
#// Set to the name of the library.
#//
#// META_COMPONENT
#// If set, the name of the meta-component to which this export
#// library belongs. If unset, the export library is linked with
#// the final executable.
#//
#//------------------------------------------------------------------------
!if defined(EXPORT_LIBRARY)
# We're building a top-level, non-component library
!if defined(MOZ_STATIC_COMPONENT_LIBS)
# Build it as a static lib, not a DLL
MAKE_OBJ_TYPE=$(NULL)
!if defined(META_COMPONENT)
META_LINK_LIBS=$(DIST)\$(META_COMPONENT)-link-libs
!endif
LIBRARY=.\$(OBJDIR)\$(LIBRARY_NAME).lib
!else
# Build the library as a standalone DLL
MAKE_OBJ_TYPE=DLL
DLL=.\$(OBJDIR)\$(LIBRARY_NAME).dll
LLIBS=$(SUB_LIBRARIES) $(LLIBS)
!endif
!endif
#//------------------------------------------------------------------------
#//
#// Definitions for miscellaneous libraries that are not components or
#// top-level export libraries.
#//
#// LIBRARY_NAME
#// The name of the library to be created.
#//
#//------------------------------------------------------------------------
!if defined(LIBRARY_NAME) && !defined(MODULE_NAME) && !defined(EXPORT_LIBRARY)
!if !defined(LIBRARY)
LIBRARY=$(OBJDIR)\$(LIBRARY_NAME).lib
!endif
!endif
#//------------------------------------------------------------------------
#//
#// Specify a default target if non was set...
@ -111,7 +244,6 @@ W32OBJS = $(OBJS:.obj=.obj, )
W32LOBJS = $(OBJS: .= +-.)
!endif
all::
$(NMAKE) -f makefile.win export
$(NMAKE) -f makefile.win install
@ -260,17 +392,137 @@ INSTALL_FILES: $(INSTALL_FILE_LIST)
!endif # INSTALL_FILES
!ifdef LIBRARY_NAME
LIBRARY=$(OBJDIR)\$(LIBRARY_NAME)$(LIBRARY_SUFFIX).lib
!endif
#//------------------------------------------------------------------------
#//
#// Global rules...
#//
#//------------------------------------------------------------------------
#//------------------------------------------------------------------------
#//
#// Rules for building components
#//
#//------------------------------------------------------------------------
!if defined(MODULE_NAME)
# We're building a component
!if defined(EXPORT_LIBRARY)
!error "Can't define both MODULE_NAME and EXPORT_LIBRARY."
!endif
!if defined(MOZ_STATIC_COMPONENT_LIBS)
# We're building this component as a static lib
!if defined(META_COMPONENT)
# It's to be linked into a meta-component. Add the component name to
# the meta component's list
export::
$(PERL) $(DEPTH)\config\build-list.pl $(_NO_FLOCK) $(META_LINK_COMPS:\=/) $(LIBRARY_NAME)
$(PERL) $(DEPTH)\config\build-list.pl $(_NO_FLOCK) $(META_LINK_COMP_NAMES:\=/) $(MODULE_NAME)
!else # defined(META_COMPONENT)
# Otherwise, it's to be linked into the main executable. Add the component
# name to the list of components, and the library name to the list of
# static libs.
export::
$(PERL) $(DEPTH)\config\build-list.pl $(_NO_FLOCK) $(FINAL_LINK_COMPS:\=/) $(LIBRARY_NAME)
$(PERL) $(DEPTH)\config\build-list.pl $(_NO_FLOCK) $(FINAL_LINK_COMP_NAMES:\=/) $(MODULE_NAME)
!endif # defined(META_COMPONENT)
install:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
clobber::
$(RM) $(DIST)\lib\$(LIBRARY_NAME).lib
!else
# Build the component as a standalone DLL. Do _not_ install the import
# library, because it's a component; nobody should be linking against
# it!
install:: $(DLL)
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
clobber::
$(RM) $(DIST)\bin\components\$(DLL)
!endif
!endif
#//------------------------------------------------------------------------
#//
#// Rules for building top-level export libraries
#//
#//------------------------------------------------------------------------
!if defined(EXPORT_LIBRARY)
# We're building a top-level, non-component library
!if defined(MOZ_STATIC_COMPONENT_LIBS)
!if defined(META_COMPONENT)
# It's to be linked into a meta-component. Add the library to the
# meta component's list
export::
$(PERL) $(DEPTH)\config\build-list.pl $(_NO_FLOCK) $(META_LINK_LIBS:\=/) $(LIBRARY_NAME)
!else # defined(META_COMPONENT)
# Otherwise, it's to be linked into the main executable. Add the
# library to the list of static libs.
export::
$(PERL) $(DEPTH)\config\build-list.pl $(_NO_FLOCK) $(FINAL_LINK_LIBS:\=/) $(LIBRARY_NAME)
!endif # defined(META_COMPONENT)
install:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
clobber::
$(RM) $(DIST)\lib\$(LIBRARY_NAME).lib
!else
# Build the library as a standalone DLL. We _will_ install the import
# library in this case, because people may link against it.
install:: $(DLL) $(OBJDIR)\$(LIBRARY_NAME).lib
$(MAKE_INSTALL) $(DLL) $(DIST)\bin
$(MAKE_INSTALL) $(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
clobber::
$(RM) $(DIST)\bin\$(DLL)
$(RM) $(DIST)\lib\$(LIBRARY_NAME).lib
!endif
!endif
#//------------------------------------------------------------------------
#//
#// Rules for miscellaneous libraries
#//
#//------------------------------------------------------------------------
!if defined(LIBRARY)
install:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)/lib
clobber::
rm -f $(DIST)/lib/$(LIBRARY_NAME).lib
!endif
#//------------------------------------------------------------------------
#//
#// Rules for recursion
#//
#//----------------------------------------------------------------------
#//
#// Set the MAKE_ARGS variable to indicate the target being built... This is used
#// when processing subdirectories via the $(DIRS) rule
@ -398,7 +650,7 @@ export:: $(DIRS)
libs::
@echo The libs build phase is obsolete.
install:: $(DIRS) $(LIBRARY)
install:: $(DIRS)
depend:: $(DIRS)
@ -423,6 +675,7 @@ $(OBJDIR):
@echo +++ make: Creating directory: $(OBJDIR)
-mkdir $(OBJDIR)
#//------------------------------------------------------------------------
#//
#// Include the makefile for building the various targets...
@ -582,6 +835,24 @@ clobber_all::
!endif
!endif
#//----------------------------------------------------------------------
#//
#// Component packaging rules
#//
#//----------------------------------------------------------------------
$(FINAL_LINK_COMPS):
@echo +++ make: creating file: $(FINAL_LINK_COMPS)
@echo. > $(FINAL_LINK_COMPS)
$(FINAL_LINK_COMP_NAMES):
@echo +++ make: creating file: $(FINAL_LINK_COMP_NAMES)
@echo. > $(FINAL_LINK_COMP_NAMES)
$(FINAL_LINK_LIBS):
@echo +++ make: creating file: $(FINAL_LINK_LIBS)
@echo. > $(FINAL_LINK_LIBS)
################################################################################
## CHROME PACKAGING
@ -612,12 +883,6 @@ _JAR_REGCHROME_DISABLE_JAR=0
!endif
!if "$(WINOS)" == "WIN95"
_NO_FLOCK=-l
!else
_NO_FLOCK=
!endif
REGCHROME = @perl -I$(DEPTH)\config $(DEPTH)\config\add-chrome.pl $(_NO_FLOCK) $(DIST)\bin\chrome\installed-chrome.txt $(_JAR_REGCHROME_DISABLE_JAR)
!ifndef MOZ_OLD_JAR_PACKAGING

3
config/rules.mk
Просмотреть файл

@ -536,6 +536,9 @@ ifdef EXPORT_LIBRARY
ifdef IS_COMPONENT
ifdef BUILD_STATIC_LIBS
@$(PERL) $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) $(LIBRARY_NAME)
ifdef MODULE_NAME
@$(PERL) $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) $(MODULE_NAME)
endif
endif
else
$(PERL) $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_LIBS) $(LIBRARY_NAME)

1003
configure поставляемый
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

31
configure.in
Просмотреть файл

@ -3261,6 +3261,22 @@ then
CXXFLAGS="$CXXFLAGS $MOZ_OPTIMIZE_FLAGS"
fi
dnl ========================================================
dnl =
dnl = --enable-reorder
dnl =
dnl = Enable function reordering.
dnl =
dnl = Function reordering is off by default.
dnl =
dnl ========================================================
MOZ_REORDER=0
MOZ_ARG_ENABLE_STRING(reorder,
[ --enable-reorder Enable function reordering ],
[ if test "$enableval" != "no"; then
MOZ_REORDER=1
fi ])
dnl ========================================================
dnl =
dnl = --disable-debug
@ -4033,6 +4049,19 @@ MOZ_ARG_ENABLE_STRING(static-components,
Build meta-component from specific components],
[ MOZ_STATIC_COMPONENTS=`echo $enableval | sed 's/,/ /g'` ] )
dnl ========================================================
dnl Enable the use of predefined meta components
dnl ========================================================
MOZ_ARG_ENABLE_STRING(meta-components,
[ --enable-meta-components
Build predefined meta-components],
[ MOZ_META_COMPONENTS=`echo $enableval | sed 's/,/ /g'` ] )
if test -n "$MOZ_STATIC_COMPONENTS" && test -n "$MOZ_META_COMPONENTS"; then
AC_MSG_ERROR([Simultaneous use of static-components & meta-components is not supported.])
fi
dnl ========================================================
case "$target" in
@ -4127,6 +4156,7 @@ AC_SUBST(BUILD_SHARED_LIBS)
AC_SUBST(BUILD_STATIC_LIBS)
AC_SUBST(MOZ_STATIC_COMPONENT_LIBS)
AC_SUBST(MOZ_STATIC_COMPONENTS)
AC_SUBST(MOZ_META_COMPONENTS)
AC_SUBST(ENABLE_TESTS)
AC_SUBST(IBMBIDI)
AC_SUBST(MOZ_USER_DIR)
@ -4145,6 +4175,7 @@ AC_SUBST(MOZ_OS2_EMX_OBJECTFORMAT)
AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
AC_SUBST(MOZ_REORDER)
dnl system JPEG support
dnl ========================================================

1
content/build/Makefile.in
Просмотреть файл

@ -33,6 +33,7 @@ LIBRARY_NAME = gkcontent
EXPORT_LIBRARY = 1
SHORT_LIBNAME = gkcontnt
IS_COMPONENT = 1
MODULE_NAME = nsContentModule
EXTRA_DSO_LIBS = gkgfx
REQUIRES = xpcom string widget necko rdf docshell dom htmlparser uriloader webshell locale unicharutil lwbrk js pref caps xul xuldoc xultmpl gfx2 timer

45
content/build/makefile.win
Просмотреть файл

@ -24,9 +24,6 @@ include <$(DEPTH)/config/config.mak>
DEFINES=-D_IMPL_NS_HTML
MODULE=raptor
IS_COMPONENT = 1
CPP_OBJS= \
.\$(OBJDIR)\dlldeps.obj \
.\$(OBJDIR)\nsContentDLF.obj \
@ -37,10 +34,9 @@ CPP_OBJS= \
EXPORTS=nsContentCID.h
MAKE_OBJ_TYPE = DLL
DLLNAME = gkcontent
DLL=.\$(OBJDIR)\$(DLLNAME).dll
MODULE=layout
LIBRARY_NAME=gkcontent
MODULE_NAME=nsContentModule
LCFLAGS = \
$(LCFLAGS) \
@ -57,23 +53,26 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\dom \
-I$(PUBLIC)\rdf
# These are the libraries we need to link with to create the dll
LLIBS= \
SUB_LIBRARIES=\
$(DIST)\lib\contentbase_s.lib \
$(DIST)\lib\contenthtmlcontent_s.lib \
$(DIST)\lib\contenthtmlcontent_s.lib \
$(DIST)\lib\contenthtmldoc_s.lib \
$(DIST)\lib\contenthtmlstyle_s.lib \
$(DIST)\lib\contentxmlcontent_s.lib \
$(DIST)\lib\contentxmldoc_s.lib \
$(DIST)\lib\contentxsldoc_s.lib \
$(DIST)\lib\contentxmldoc_s.lib \
$(DIST)\lib\contentxsldoc_s.lib \
$(DIST)\lib\contentxulcontent_s.lib \
$(DIST)\lib\contentxuldocument_s.lib \
$(DIST)\lib\contentxultemplates_s.lib \
$(DIST)\lib\contentxbl_s.lib \
$(DIST)\lib\contentevents_s.lib \
$(DIST)\lib\contentshared_s.lib \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\timer_s.lib \
$(DIST)\lib\contentxbl_s.lib \
$(DIST)\lib\contentevents_s.lib \
$(DIST)\lib\contentshared_s.lib \
$(NULL)
LLIBS=\
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\gkgfx.lib \
$(DIST)\lib\timer_s.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
!if defined(MOZ_PERF)
$(DIST)\lib\util.lib \
@ -82,16 +81,10 @@ LLIBS= \
include <$(DEPTH)\config\rules.mak>
install:: gbdate.h $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
clobber::
rm -f $(DIST)\bin\components\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib
rm -f gbdate.h
export:: gbdate.h
gbdate.h:: gbdate.pl
$(PERL) gbdate.pl > gbdate.h
echo +++ make: Creating $@
$(PERL) gbdate.pl > gbdate.h

17
content/build/nsContentModule.cpp
Просмотреть файл

@ -53,6 +53,8 @@
// XXX
#include "nsIServiceManager.h"
#include "nsIGenericFactory.h"
#include "nsRange.h"
#include "nsGenericElement.h"
#include "nsContentHTTPStartup.h"
@ -73,7 +75,8 @@
static nsContentModule *gModule = NULL;
extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr,
extern "C" NS_EXPORT nsresult
NSGETMODULE_ENTRY_POINT(nsContentModule) (nsIComponentManager *servMgr,
nsIFile* location,
nsIModule** return_cobj)
{
@ -342,9 +345,9 @@ static Components gComponents[] = {
NS_IMETHODIMP
nsContentModule::RegisterSelf(nsIComponentManager *aCompMgr,
nsIFile* aPath,
const char* registryLocation,
const char* componentType)
nsIFile* aPath,
const char* registryLocation,
const char* componentType)
{
nsresult rv = NS_OK;
@ -355,8 +358,10 @@ nsContentModule::RegisterSelf(nsIComponentManager *aCompMgr,
Components* cp = gComponents;
Components* end = cp + NUM_COMPONENTS;
while (cp < end) {
rv = aCompMgr->RegisterComponentSpec(cp->mCID, cp->mDescription,
cp->mContractID, aPath, PR_TRUE, PR_TRUE);
rv = aCompMgr->RegisterComponentWithType(cp->mCID, cp->mDescription,
cp->mContractID, aPath,
registryLocation, PR_TRUE,
PR_TRUE, componentType);
if (NS_FAILED(rv)) {
#ifdef DEBUG
printf("nsContentModule: unable to register %s component => %x\n",

1
db/mork/build/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = mork
LIBRARY_NAME = mork
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsMorkModule
REQUIRES = xpcom
CPPSRCS = nsMorkFactory.cpp

17
db/mork/build/makefile.win
Просмотреть файл

@ -20,7 +20,9 @@
# Contributor(s):
DEPTH=..\..\..
MODULE=msgmork
MODULE = mork
LIBRARY_NAME = mork
MODULE_NAME = nsMorkModule
################################################################################
## exports
@ -33,22 +35,17 @@ EXPORTS= \
################################################################################
## library
LIBNAME = .\$(OBJDIR)\mork
DLL = $(LIBNAME).dll
CPP_OBJS= \
.\$(OBJDIR)\nsMorkFactory.obj \
$(NULL)
SUB_LIBRARIES= \
$(DIST)\lib\msgmork_s.lib \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\msgmork_s.lib \
$(LIBNSPR) \
$(NULL)
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
$(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib

3
db/mork/src/Makefile.in
Просмотреть файл

@ -29,6 +29,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = mork
LIBRARY_NAME = msgmork_s
REQUIRES = xpcom
FORCE_STATIC_LIB=1
CPPSRCS = \
orkinCell.cpp \
@ -97,7 +98,5 @@ EXTRA_DSO_LDOPTS = \
$(NSPR_LIBS) \
$(NULL)
FORCE_STATIC_LIB=1
include $(topsrcdir)/config/rules.mk

2
directory/xpcom/base/src/Makefile.in
Просмотреть файл

@ -41,7 +41,9 @@ include $(DEPTH)/config/autoconf.mk
MODULE = mozldap
LIBRARY_NAME = mozldap
SHORT_LIBNAME = mozldap
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsLDAPProtocolModule
REQUIRES = xpcom string necko

10
directory/xpcom/base/src/makefile.win
Просмотреть файл

@ -19,9 +19,9 @@ DEPTH=..\..\..\..
include <$(DEPTH)\config\config.mak>
MODULE = mozldap
LIBNAME = .\$(OBJDIR)\mozldap
DLL = $(LIBNAME).dll
MODULE=mozldap
LIBRARY_NAME=mozldap
MODULE_NAME=nsLDAPProtocolModule
LLIBS = $(LIBNSPR) \
$(DIST)\lib\xpcom.lib \
@ -55,7 +55,3 @@ C_OBJS = .\$(OBJDIR)\nsLDAPConnectionCallbacks.obj \
$(NULL)
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
$(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib

1
docshell/build/Makefile.in
Просмотреть файл

@ -25,6 +25,7 @@ VPATH = @srcdir@
MODULE = docshell
IS_COMPONENT = 1
MODULE_NAME = docshell_provider
include $(DEPTH)/config/autoconf.mk

21
docshell/build/makefile.win
Просмотреть файл

@ -20,13 +20,11 @@
# Contributor(s):
DEPTH=..\..
include <$(DEPTH)\config\config.mak>
MODULE=docshell
MAKE_OBJ_TYPE = DLL
DLLNAME = docshell
DLL=.\$(OBJDIR)\$(DLLNAME).dll
MODULE=docshell
LIBRARY_NAME=docshell
MODULE_NAME=docshell_provider
LINCS=-I..\base
@ -35,16 +33,15 @@ CPP_OBJS= \
$(NULL)
# These are the libraries we need to link with to create the dll
LLIBS = \
SUB_LIBRARIES=\
$(DIST)\lib\basedocshell_s.lib \
$(NULL)
LLIBS = \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\timer_s.lib \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\gkgfx.lib \
$(LIBNSPR)
include <$(DEPTH)\config\config.mak>
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib

1
dom/src/build/Makefile.in
Просмотреть файл

@ -31,6 +31,7 @@ LIBRARY_NAME = jsdom
EXPORT_LIBRARY = 1
REQUIRES = xpcom string js xpconnect widget layout pref caps timer locale webbrwsr gfx2 xuldoc docshell sidebar plugin necko
IS_COMPONENT = 1
MODULE_NAME = DOM_components
CPPSRCS = \
nsDOMFactory.cpp \

25
dom/src/build/makefile.win
Просмотреть файл

@ -31,31 +31,26 @@ CPPSRCS = nsDOMFactory.cpp \
CPP_OBJS = .\$(OBJDIR)\nsDOMFactory.obj \
.\$(OBJDIR)\nsScriptNameSpaceManager.obj
MAKE_OBJ_TYPE = DLL
DLLNAME = jsdom
DLL=.\$(OBJDIR)\$(DLLNAME).dll
DLL_CFLAGS = \
MODULE=dom
LIBRARY_NAME=jsdom
MODULE_NAME=DOM_components
LCFLAGS = \
$(DEFINES) \
$(INCLUDES) \
$(NULL)
# These are the libraries we need to link with to create the dll
LLIBS= \
SUB_LIBRARIES= \
$(DIST)\lib\jsdombase_s.lib \
$(DIST)\lib\jsdomevents_s.lib \
$(DIST)\lib\gkgfxwin.lib \
$(NULL)
LLIBS= \
$(DIST)\lib\gkgfx.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\caps.lib \
$(LIBNSPR)
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
clobber::
rm -f $(DIST)\bin\components\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib

27
dom/src/build/nsDOMFactory.cpp
Просмотреть файл

@ -196,30 +196,3 @@ NS_IMPL_NSGETMODULE_WITH_DTOR(DOM_components, gDOMModuleInfo,
DOMModuleDestructor)
#ifdef DEBUG
/* These are here to be callable from a debugger */
#include "nsIServiceManager.h"
#include "nsIXPConnect.h"
JS_BEGIN_EXTERN_C
void DumpJSStack()
{
nsresult rv;
NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
if(NS_SUCCEEDED(rv))
xpc->DebugDumpJSStack(PR_TRUE, PR_TRUE, PR_FALSE);
else
printf("failed to get XPConnect service!\n");
}
void DumpJSEval(PRUint32 frame, const char* text)
{
nsresult rv;
NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
if(NS_SUCCEEDED(rv))
xpc->DebugDumpEvalInJSStackFrame(frame, text);
else
printf("failed to get XPConnect service!\n");
}
JS_END_EXTERN_C
#endif

1
dom/src/jsurl/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = jsurl
LIBRARY_NAME = jsurl
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = javascript__protocol
REQUIRES = xpcom string js dom necko caps widget layout docshell uriloader locale appshell rdf gfx2 xpconnect jsconsole
XPIDLSRCS = \

9
dom/src/jsurl/makefile.win
Просмотреть файл

@ -23,9 +23,9 @@ DEPTH=..\..\..
MODULE=jsurl
include <$(DEPTH)/config/config.mak>
IS_COMPONENT=1
DLLNAME=jsurl
DLL=.\$(OBJDIR)\$(DLLNAME).dll
MODULE=jsurl
LIBRARY_NAME=jsurl
MODULE_NAME= javascript__protocol
#------------------------------------------------------------------------
#
@ -65,6 +65,3 @@ XPIDLSRCS = \
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components

1
editor/base/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = editor
LIBRARY_NAME = editor
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsEditorModule
REQUIRES = xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc gfx2 mozcomps windowwatcher exthandler mimetype
CPPSRCS = \

19
editor/base/makefile.win
Просмотреть файл

@ -183,11 +183,8 @@ DEFINES = -DENABLE_EDITOR_API_LOG $(DEFINES)
!endif
MODULE=editor
MAKE_OBJ_TYPE = DLL
DLLNAME = editor
DLL=.\$(OBJDIR)\$(DLLNAME).dll
LIBRARY_NAME=editor
MODULE_NAME=nsEditorModule
LCFLAGS = \
$(LCFLAGS) \
@ -198,18 +195,8 @@ LCFLAGS = \
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\js3250.lib \
$(DIST)\lib\gkparser.lib \
$(DIST)\lib\raptorwidget_s.lib \
$(DIST)\lib\timer_s.lib \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\gkgfx.lib \
$(LIBNSPR)
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
clobber::
rm -f $(DIST)\bin\components\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib

1
editor/composer/src/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = editor
LIBRARY_NAME = composer
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsComposerModule
REQUIRES = xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc
CPPSRCS = \

29
editor/libeditor/build/makefile.win
Просмотреть файл

@ -24,7 +24,7 @@ DEPTH=..\..\..
include <$(DEPTH)/config/config.mak>
MODULE = editor
IS_COMPONENT = 1
LIBRARY_NAME = texteditor
# Uncomment the line below, or define MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY
# in your environment, to build only the plain text editor core files:
@ -42,8 +42,6 @@ CPP_OBJS = \
.\$(OBJDIR)\nsTextEditorReg.obj \
$(NULL)
DLLNAME = texteditor
!else
CPPSRCS = \
@ -63,8 +61,6 @@ ENABLE_EDITOR_API_LOG=1
DEFINES = -DENABLE_EDITOR_API_LOG $(DEFINES)
!endif
DLLNAME = editor
!endif
LINCS = \
@ -73,9 +69,6 @@ LINCS = \
-I..\text\src \
$(NULL)
MAKE_OBJ_TYPE = DLL
DLL = .\$(OBJDIR)\$(DLLNAME).dll
LCFLAGS = \
$(LCFLAGS) \
$(DEFINES) \
@ -83,7 +76,7 @@ LCFLAGS = \
# These are the base editor libraries we need to link with to create the dll
LLIBS = \
SUB_LIBRARIES = \
$(DIST)\lib\libbaseeditor_s.lib \
$(DIST)\lib\libtexteditor_s.lib \
$(NULL)
@ -97,8 +90,7 @@ LINCS = \
# These are the html editor libraries we need to link with to create the dll
LLIBS = \
$(LLIBS) \
SUB_LIBRARIES = \
$(DIST)\lib\libhtmleditor_s.lib \
$(NULL)
@ -114,18 +106,3 @@ LLIBS = \
include <$(DEPTH)\config\rules.mak>
build:: $(DLL)
!if !defined(MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY)
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
set MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY=1
nmake -f makefile.win build
clobber::
rm -f $(DIST)\bin\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib
!endif

1
editor/libeditor/text/src/Makefile.in
Просмотреть файл

@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk
MODULE = editor
LIBRARY_NAME = texteditor_s
IS_COMPONENT = 1
REQUIRES = xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc
CPPSRCS = \

1
editor/txmgr/src/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = txmgr
LIBRARY_NAME = txmgr
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsTransactionManagerModule
REQUIRES = xpcom string
CPPSRCS = \

14
editor/txmgr/src/makefile.win
Просмотреть файл

@ -41,16 +41,13 @@ CPP_OBJS = \
$(NULL)
MODULE=txmgr
LIBRARY_NAME=txmgr
MODULE_NAME=nsTransactionManagerModule
LINCS=-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\txmgr \
-I$(PUBLIC)\base \
-I$(PUBLIC)\raptor
MAKE_OBJ_TYPE = DLL
DLLNAME = txmgr
DLL=.\$(OBJDIR)\$(DLLNAME).dll
LCFLAGS = \
$(LCFLAGS) \
$(DEFINES) \
@ -64,10 +61,3 @@ LLIBS = \
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
clobber::
rm -f $(DIST)\bin\components\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib

1
editor/txtsvc/src/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = txtsvc
LIBRARY_NAME = txtsvc
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsTextServicesModule
REQUIRES = xpcom string editor layout dom widget txmgr
CPPSRCS = \

16
editor/txtsvc/src/makefile.win
Просмотреть файл

@ -50,9 +50,9 @@ LINCS=-I$(PUBLIC)\xpcom \
LLIBS= \
$(DIST)\lib\xpcom.lib
MAKE_OBJ_TYPE = DLL
DLLNAME = txtsvc
DLL=.\$(OBJDIR)\$(DLLNAME).dll
MAKE_OBJ_TYPE = LIB
LIBRARY_NAME = txtsvc
LIB=.\$(OBJDIR)\$(LIBRARY_NAME).lib
LCFLAGS = \
$(LCFLAGS) \
@ -64,10 +64,10 @@ LLIBS=$(DIST)\lib\xpcom.lib
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
install:: $(LIB)
$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
clobber::
rm -f $(DIST)\bin\components\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib
rm -f $(DIST)\bin\components\$(LIBRARY_NAME).lib
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

1
embedding/browser/build/Makefile.in
Просмотреть файл

@ -26,6 +26,7 @@ VPATH = @srcdir@
MODULE = webbrwsr
IS_COMPONENT = 1
MODULE_NAME = Browser_Embedding_Module
include $(DEPTH)/config/autoconf.mk

20
embedding/browser/build/makefile.win
Просмотреть файл

@ -22,12 +22,11 @@
DEPTH=..\..\..
include <$(DEPTH)\config\config.mak>
MODULE=webbrwsr
MAKE_OBJ_TYPE = DLL
DLLNAME = webbrwsr
DLL=.\$(OBJDIR)\$(DLLNAME).dll
LIBRARY_NAME=webbrwsr
MODULE_NAME=Browser_Embedding_Module
LINCS=-I..\webBrowser
@ -36,15 +35,14 @@ CPP_OBJS= \
$(NULL)
# These are the libraries we need to link with to create the dll
LLIBS = \
SUB_LIBRARIES=\
$(DIST)\lib\nsWebBrowser_s.lib \
$(NULL)
LLIBS = \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\gkgfx.lib \
$(LIBNSPR)
include <$(DEPTH)\config\config.mak>
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib

1
embedding/components/build/Makefile.in
Просмотреть файл

@ -28,6 +28,7 @@ LIBRARY_NAME = embedcomponents
EXPORT_LIBRARY = 1
SHORT_LIBNAME = embedcmp
IS_COMPONENT = 1
MODULE_NAME = embedcomponents
REQUIRES = js xpcom string windowwatcher jsconsole find embed_base dom txtsvc
CPPSRCS = nsModule.cpp

28
embedding/components/build/makefile.win
Просмотреть файл

@ -19,11 +19,12 @@
# Contributor(s):
DEPTH=..\..\..
MODULE=embedcomponents
MAKE_OBJ_TYPE=DLL
DLLNAME=embedcomponents
DLL=.\$(OBJDIR)\$(DLLNAME).dll
include <$(DEPTH)\config\config.mak>
MODULE=embedcomponents
LIBRARY_NAME=embedcomponents
MODULE_NAME=embedcomponents
LCFLAGS = -DWIN32_LEAN_AND_MEAN
@ -31,16 +32,19 @@ CPP_OBJS = \
.\$(OBJDIR)\nsModule.obj \
$(NULL)
LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\js3250.lib \
$(DIST)\lib\xpcom.lib \
SUB_LIBRARIES = \
$(DIST)\lib\windowwatcher_s.lib \
$(DIST)\lib\jsconsole_s.lib \
$(DIST)\lib\appstartupnotifier_s.lib \
$(DIST)\lib\find_s.lib \
$(NULL)
LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\js3250.lib \
$(DIST)\lib\xpcom.lib \
$(NULL)
INCS = $(INCS) \
-I$(DEPTH)\embedding\components\windowwatcher\src \
-I$(DEPTH)\embedding\components\jsconsole\src \
@ -49,11 +53,3 @@ INCS = $(INCS) \
$(NULL)
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
clobber::
$(RM) $(DIST)\bin\components\$(DLLNAME).dll
$(RM) $(DIST)\lib\$(DLLNAME).lib

2
embedding/tests/apitest/makefile.win
Просмотреть файл

@ -32,7 +32,7 @@ OBJS = \
LLIBS= \
$(DIST)\lib\baseembed_s.lib \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\gkgfx.lib \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR) \
$(NULL)

1
embedding/tests/gtkEmbed/Makefile.in
Просмотреть файл

@ -36,6 +36,7 @@ PROGRAM = gtkEmbed
LIBS= \
$(DIST)/lib/libembed_base_s.$(LIB_SUFFIX) \
$(MOZ_COMPONENT_LIBS) \
$(XPCOM_LIBS) \
-lgtksuperwin \
$(PROFILE_LIBS) \
$(NULL)

2
embedding/tests/mfcembed/makefile.win
Просмотреть файл

@ -53,7 +53,7 @@ OBJS = \
LLIBS= \
$(DIST)\lib\baseembed_s.lib \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\gkgfx.lib \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\mfcEmbedComponents.lib \
$(LIBNSPR) \

2
embedding/tests/winEmbed/makefile.win
Просмотреть файл

@ -36,7 +36,7 @@ OBJS = \
LLIBS= \
$(DIST)\lib\baseembed_s.lib \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\gkgfx.lib \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR) \
$(NULL)

1
extensions/access-builtin/accessproxy/Makefile.in
Просмотреть файл

@ -39,6 +39,7 @@ SHORT_LIBNAME = accproxy
REQUIRES = xpcom string docshell dom js widget necko layout uriloader gfx2 locale mozcomps
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsAccessProxy
CPPSRCS = \
nsAccessProxy.cpp \

120
extensions/access-builtin/accessproxy/makefile.win
Просмотреть файл

@ -1,64 +1,56 @@
#!gmake
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
# License for the specific language governing rights and limitations
# under the License.
# The Initial Developer of the Original Code is Aaron Leventhal.
# Portions created by Aaron Leventhal are Copyright (C) 2001
# Aaron Leventhal. All Rights Reserved.
# Alternatively, the contents of this file may be used under the terms
# of the GNU General Public License (the "GPL"), in which case the
# provisions of the GPL are applicable instead of those above. If you
# wish to allow use of your version of this file only under the terms of
# the GPL and not to allow others to use your version of this file under
# the MPL, indicate your decision by deleting the provisions above and
# replace them with the notice and other provisions required by the
# GPL. If you do not delete the provisions above, a recipient may use
# your version of this file under either the MPL or the GPL.
# Contributor(s):
DEPTH=..\..\..
MODULE=accessproxy
XPIDL_MODULE = accessproxy
LIBRARY_NAME = accessproxy
IS_COMPONENT = 1
MAKE_OBJ_TYPE=DLL
DLLNAME=$(MODULE)
DLL=.\$(OBJDIR)\$(DLLNAME).dll
XPIDLSRCS= .\nsIAccessProxy.idl \
$(NULL)
CPP_OBJS=\
.\$(OBJDIR)\nsAccessProxy.obj \
.\$(OBJDIR)\nsAccessProxyRegistration.obj \
$(NULL)
LLIBS=\
$(DIST)\lib\xpcom.lib \
$(LIBPLC) \
$(LIBNSPR) \
$(NULL)
LINCS=\
-I$(PUBLIC)\accessproxy \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
$(NULL)
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
#!gmake
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
# License for the specific language governing rights and limitations
# under the License.
# The Initial Developer of the Original Code is Aaron Leventhal.
# Portions created by Aaron Leventhal are Copyright (C) 2001
# Aaron Leventhal. All Rights Reserved.
# Alternatively, the contents of this file may be used under the terms
# of the GNU General Public License (the "GPL"), in which case the
# provisions of the GPL are applicable instead of those above. If you
# wish to allow use of your version of this file only under the terms of
# the GPL and not to allow others to use your version of this file under
# the MPL, indicate your decision by deleting the provisions above and
# replace them with the notice and other provisions required by the
# GPL. If you do not delete the provisions above, a recipient may use
# your version of this file under either the MPL or the GPL.
# Contributor(s):
DEPTH=..\..\..
MODULE = accessproxy
XPIDL_MODULE = accessproxy
LIBRARY_NAME = accessproxy
MODULE_NAME = nsAccessProxy
XPIDLSRCS= .\nsIAccessProxy.idl \
$(NULL)
CPP_OBJS=\
.\$(OBJDIR)\nsAccessProxy.obj \
.\$(OBJDIR)\nsAccessProxyRegistration.obj \
$(NULL)
LLIBS=\
$(DIST)\lib\xpcom.lib \
$(LIBPLC) \
$(LIBNSPR) \
$(NULL)
LINCS=\
-I$(PUBLIC)\accessproxy \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
$(NULL)
include <$(DEPTH)\config\rules.mak>

1
extensions/cookie/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = cookie
LIBRARY_NAME = cookie
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsCookieModule
REQUIRES = xpcom string necko dom js widget layout pref intl locale uriloader windowwatcher
ifdef ENABLE_TESTS

20
extensions/cookie/makefile.win
Просмотреть файл

@ -24,6 +24,8 @@ include <$(DEPTH)/config/config.mak>
DEFINES=-D_IMPL_NS_COOKIE -DWIN32_LEAN_AND_MEAN
MODULE=cookie
LIBRARY_NAME=cookie
MODULE_NAME=nsCookieModule
EXPORTS = nsCookieHTTPNotify.h
@ -67,11 +69,6 @@ CPP_OBJS= \
LINCS = -I$(DEPTH)\include \
MAKE_OBJ_TYPE = DLL
DLLNAME = cookie
DLL=.\$(OBJDIR)\$(DLLNAME).dll
LCFLAGS = \
$(LCFLAGS) \
$(DEFINES) \
@ -82,11 +79,6 @@ LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \
$(DIST)\lib\xpcom.lib \
!ifdef NECKO
$(DIST)\lib\necko.lib \
!else
$(DIST)\lib\netwerk.lib \
!endif
$(HASHLIBS)
!if !defined(DISABLE_TESTS)
@ -95,14 +87,6 @@ DIRS=tests
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
clobber::
rm -f $(DIST)\bin\components\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib
chrome::
$(REGCHROME) content cookie comm.jar
$(REGCHROME) locale en-US/cookie en-US.jar

1
extensions/inspector/build/src/Makefile.in
Просмотреть файл

@ -32,6 +32,7 @@ EXPORT_LIBRARY = 1
SHORT_LIBNAME = inspectr
REQUIRES = xpcom string layout dom widget js rdf rdfutil locale gfx2 timer necko
IS_COMPONENT = 1
MODULE_NAME = nsInspectorModule
CPPSRCS = \
nsInspectorModule.cpp \

12
extensions/inspector/build/src/makefile.win
Просмотреть файл

@ -19,9 +19,8 @@
DEPTH=..\..\..\..
MODULE=inspector
LIBNAME = .\$(OBJDIR)\inspector
DLL = $(LIBNAME).dll
LIBRARY_NAME=inspector
MODULE_NAME=nsInspectorModule
################################################################################
## library
@ -36,15 +35,10 @@ LLIBS= \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\rdfutil_s.lib \
$(DIST)\lib\inspector_s.lib \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\gkgfx.lib \
$(DIST)\lib\contenthtmlstyle_s.lib \
$(DIST)\lib\contentshared_s.lib \
$(LIBNSPR) \
$(NULL)
include <$(DEPTH)/config/rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
$(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib

1
extensions/p3p/src/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = p3p
LIBRARY_NAME = p3p
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsP3PModule
REQUIRES = p3p xpcom windowwatcher

19
extensions/p3p/src/makefile.win
Просмотреть файл

@ -24,11 +24,9 @@ DEPTH = ..\..\..
include <$(DEPTH)/config/config.mak>
MODULE = p3p
LIBRARY_NAME = p3p
DLLNAME = p3p
DLL = .\$(OBJDIR)\$(DLLNAME).dll
IS_COMPONENT = 1
MODULE = p3p
LIBRARY_NAME = p3p
MODULE_NAME = nsP3PModule
REQUIRES = p3p xpcom
@ -97,14 +95,3 @@ LCFLAGS = \
$(NULL)
include <$(DEPTH)\config\rules.mak>
clobber::
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
rm -f $(DIST)\lib\$(DLLNAME).lib
rm -f $(DIST)\bin\components\$(DLLNAME).dll
install:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components

14
extensions/pics/src/makefile.win
Просмотреть файл

@ -25,6 +25,8 @@ include <$(DEPTH)/config/config.mak>
DEFINES=-D_IMPL_NS_PICS -DWIN32_LEAN_AND_MEAN
MODULE=pics
LIBRARY_NAME=pics
MODULE_NAME=nsPICSModule
CSRCS= \
cslabel.c \
@ -62,11 +64,6 @@ LINCS = -I$(PUBLIC)/js \
-I$(PUBLIC)\pref \
-I$(DEPTH)\include \
MAKE_OBJ_TYPE = DLL
DLLNAME = pics
DLL=.\$(OBJDIR)\$(DLLNAME).dll
LCFLAGS = \
$(LCFLAGS) \
$(DEFINES) \
@ -83,10 +80,3 @@ LLIBS = \
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
clobber::
rm -f $(DIST)\bin\components\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib

12
extensions/psm-glue/public/makefile.win
Просмотреть файл

@ -23,16 +23,11 @@
# Terry Hayes <thayes@netscape.com>
#
MODULE = psmglue
DEPTH=..\..\..
IGNORE_MANIFEST=1
DLLNAME = psmglue
PDBFILE = $(DLLNAME).pdb
MAPFILE = $(DLLNAME).map
DLL = .\$(OBJDIR)\$(DLLNAME).dll
MAKE_OBJ_TYPE = DLL
MODULE = psmglue
LIBRARY_NAME = psmglue
include <$(DEPTH)/config/config.mak>
@ -48,3 +43,6 @@ include <$(DEPTH)\config\rules.mak>
install::
$(MAKE_INSTALL) .\psm-glue.js $(DIST)\bin\defaults\pref

11
extensions/psm-glue/src/makefile.win
Просмотреть файл

@ -27,11 +27,9 @@ MODULE = psmglue
DEPTH=..\..\..
IGNORE_MANIFEST=1
DLLNAME = psmglue
PDBFILE = $(DLLNAME).pdb
MAPFILE = $(DLLNAME).map
DLL = .\$(OBJDIR)\$(DLLNAME).dll
MAKE_OBJ_TYPE = DLL
MODULE = psmglue
LIBRARY_NAME = psmglue
MODULE_NAME = PSMComponent
include <$(DEPTH)/config/config.mak>
@ -71,6 +69,3 @@ OBJS = \
$(NULL)
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components

6
extensions/python/xpcom/src/loader/makefile.win
Просмотреть файл

@ -21,9 +21,8 @@
DEPTH=..\..\..\..\..
include <$(DEPTH)/config/config.mak>
MODULE=pyloader
LIBRARY_NAME=pyloader
DLLNAME=pyloader
DLL=.\$(OBJDIR)\$(DLLNAME).dll
CPP_OBJS= \
.\$(OBJDIR)\pyloader.obj \
@ -56,6 +55,3 @@ include <$(DEPTH)\config\rules.mak>
#clobber::
# echo write me
install:: $(DLL)
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components\.

3
extensions/python/xpcom/src/makefile.win
Просмотреть файл

@ -25,13 +25,12 @@ DIRS = \
DEPTH=..\..\..\..
include <$(DEPTH)/config/config.mak>
LIBRARY_NAME=_xpcom
DLLNAME=_xpcom
!ifdef MOZ_DEBUG
DLL=.\$(OBJDIR)\$(DLLNAME)_d.pyd
!else
DLL=.\$(OBJDIR)\$(DLLNAME).pyd
!endif
!endif
CPP_OBJS= \
.\$(OBJDIR)\ErrorUtils.obj \

1
extensions/transformiix/build/Makefile.in
Просмотреть файл

@ -32,6 +32,7 @@ EXPORT_LIBRARY = 1
SHORT_LIBNAME = t8iix
REQUIRES = xpcom string dom docshell necko layout widget caps webbrwsr js uriloader locale xpconnect gfx2 appshell embedcomponents xsl_doc
IS_COMPONENT = 1
MODULE_NAME = TransformiixModule
CPPSRCS = XSLTProcessorModule.cpp

14
extensions/transformiix/build/makefile.win
Просмотреть файл

@ -23,7 +23,8 @@ DEPTH=..\..\..
include <$(DEPTH)/config/config.mak>
MODULE=transformiix
IS_COMPONENT = 1
LIBRARY_NAME=transformiix
MODULE_NAME=TransformiixModule
CPPSRCS= \
XSLTProcessorModule.cpp \
@ -121,10 +122,6 @@ CPP_OBJS= \
.\$(OBJDIR)\XSLTProcessorModule.obj \
$(NULL)
MAKE_OBJ_TYPE = DLL
DLLNAME = transformiix
DLL=.\$(OBJDIR)\$(DLLNAME).dll
LCFLAGS = \
$(LCFLAGS) \
$(DEFINES) \
@ -150,10 +147,3 @@ WIN_LIBS = \
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
clobber::
rm -f $(DIST)\bin\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib

1
extensions/vixen/build/src/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = vixen
LIBRARY_NAME = vixen
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsVixenModule
CPPSRCS = \
nsVixenModule.cpp \

10
extensions/vixen/build/src/makefile.win
Просмотреть файл

@ -19,9 +19,8 @@
DEPTH=..\..\..\..
MODULE=vixen
LIBNAME = .\$(OBJDIR)\vixen
DLL = $(LIBNAME).dll
LIBRARY_NAME=vixen
MODULE_NAME=nsVixenModule
################################################################################
## library
@ -39,8 +38,3 @@ LLIBS= \
$(NULL)
include <$(DEPTH)/config/rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
$(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib

1
extensions/wallet/build/Makefile.in
Просмотреть файл

@ -31,6 +31,7 @@ LIBRARY_NAME = walletviewers
EXPORT_LIBRARY = 1
SHORT_LIBNAME = wlltvwrs
IS_COMPONENT = 1
MODULE_NAME = nsWalletViewerModule
REQUIRES = xpcom string dom js
CPPSRCS = nsWalletViewerFactory.cpp

13
extensions/wallet/build/makefile.win
Просмотреть файл

@ -23,9 +23,8 @@
DEPTH=..\..\..
MODULE = walletviewers
LIBNAME = .\$(OBJDIR)\wlltvwrs
DLL = $(LIBNAME).dll
LIBRARY_NAME = wlltvwrs
MODULE_NAME = nsWalletViewerModule
LINCS = \
-I..\editor \
@ -37,10 +36,13 @@ CPP_OBJS = \
.\$(OBJDIR)\nsWalletViewerFactory.obj \
$(NULL)
LLIBS = \
SUB_LIBRARIES = \
$(DIST)\lib\signonviewer_s.lib \
$(DIST)\lib\walletpreview_s.lib \
$(DIST)\lib\walleteditor_s.lib \
$(NULL)
LLIBS = \
$(DIST)\lib\xpcom.lib \
$(NULL)
@ -49,6 +51,3 @@ WIN_LIBS = \
$(NULL)
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components

2
extensions/wallet/signonviewer/resources/content/makefile.win
Просмотреть файл

@ -27,7 +27,7 @@ clobber::
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\SignonViewer.xul
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\SignonViewer.js
install:: $(DLL)
install::
$(MAKE_INSTALL) SignonViewer.xul $(DIST)\bin\chrome\packages\core\communicator\content\wallet
$(MAKE_INSTALL) SignonViewer.js $(DIST)\bin\chrome\packages\core\communicator\content\wallet

3
extensions/wallet/signonviewer/resources/locale/en-US/makefile.win
Просмотреть файл

@ -24,13 +24,12 @@ DEPTH=..\..\..\..\..\..
include <$(DEPTH)\config\rules.mak>
clobber::
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\SignonViewer.xul
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\SignonViewer.js
rm -f $(DIST)\bin\chrome\skins\modern\communicator\skin\wallet\SignonViewer.css
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\SignonViewer.properties
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\SignonViewer.dtd
install:: $(DLL)
install::
$(MAKE_INSTALL) SignonViewer.properties $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
$(MAKE_INSTALL) SignonViewer.dtd $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet

1
extensions/wallet/src/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = wallet
LIBRARY_NAME = wallet
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWalletModule
REQUIRES = xpcom string necko dom js layout widget uriloader pref webshell docshell appshell locale intl gfx2 windowwatcher
CPPSRCS = \

28
extensions/wallet/src/makefile.win
Просмотреть файл

@ -22,9 +22,10 @@
DEPTH=..\..\..
include <$(DEPTH)/config/config.mak>
MODULE=wallet
LIBRARY_NAME=wallet
DLLNAME=wallet
DLL=.\$(OBJDIR)\$(DLLNAME).dll
MODULE_NAME=nsWalletModule
CPP_OBJS= .\$(OBJDIR)\wallet.obj \
.\$(OBJDIR)\singsign.obj \
.\$(OBJDIR)\nsPassword.obj \
@ -72,13 +73,7 @@ LCFLAGS = \
include <$(DEPTH)\config\rules.mak>
install:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
clobber::
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
rm -f $(DIST)\bin\components\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib
rm -f $(DIST)\bin\defaults\wallet\DistinguishedSchema.tbl
rm -f $(DIST)\bin\defaults\wallet\FieldSchema.tbl
rm -f $(DIST)\bin\defaults\wallet\VcardSchema.tbl
@ -87,12 +82,11 @@ clobber::
rm -f $(DIST)\bin\defaults\wallet\PositionalSchema.tbl
rm -f $(DIST)\bin\defaults\wallet\StateSchema.tbl
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) DistinguishedSchema.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) FieldSchema.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) VcardSchema.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) SchemaConcat.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) SchemaStrings.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) PositionalSchema.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) StateSchema.tbl $(DIST)\bin\defaults\wallet
install::
$(MAKE_INSTALL) DistinguishedSchema.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) FieldSchema.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) VcardSchema.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) SchemaConcat.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) SchemaStrings.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) PositionalSchema.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) StateSchema.tbl $(DIST)\bin\defaults\wallet

1
extensions/xmlextras/build/src/Makefile.in
Просмотреть файл

@ -31,6 +31,7 @@ LIBRARY_NAME = xmlextras
EXPORT_LIBRARY = 1
SHORT_LIBNAME = xmlextra
IS_COMPONENT = 1
MODULE_NAME = nsXMLExtrasModule
REQUIRES = xpcom string dom js layout widget caps necko webbrwsr embedcomponents
CPPSRCS = nsXMLExtrasModule.cpp

17
extensions/xmlextras/build/src/makefile.win
Просмотреть файл

@ -19,9 +19,8 @@
DEPTH=..\..\..\..
MODULE=xmlextras
LIBNAME = .\$(OBJDIR)\xmlextras
DLL = $(LIBNAME).dll
LIBRARY_NAME=xmlextras
MODULE_NAME=nsXMLExtrasModule
################################################################################
## library
@ -32,13 +31,16 @@ CPP_OBJS= \
.\$(OBJDIR)\nsXMLExtrasModule.obj \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\js3250.lib \
SUB_LIBRARIES= \
$(DIST)\lib\xmlextrasbase_s.lib \
!if defined(MOZ_SOAP)
$(DIST)\lib\xmlextrassoap_s.lib \
!endif
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\js3250.lib \
$(LIBNSPR) \
$(NULL)
@ -53,6 +55,3 @@ LCFLAGS = \
include <$(DEPTH)/config/rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
$(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib

2
gfx/public/nsDeviceContext.h
Просмотреть файл

@ -35,7 +35,7 @@ class nsIImageRequest;
class nsHashtable;
class nsFontCache;
class DeviceContextImpl : public nsIDeviceContext
class NS_GFX DeviceContextImpl : public nsIDeviceContext
{
public:
DeviceContextImpl();

2
gfx/public/nsRenderingContextImpl.h
Просмотреть файл

@ -34,7 +34,7 @@ typedef struct {
} Edge;
class nsRenderingContextImpl : public nsIRenderingContext
class NS_GFX nsRenderingContextImpl : public nsIRenderingContext
{
// CLASS MEMBERS

1
gfx/src/beos/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = layout
LIBRARY_NAME = gfx_beos
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsGfxBeOSModule
CPPSRCS = \
nsDeviceContextBeOS.cpp \

3
gfx/src/gtk/Makefile.in
Просмотреть файл

@ -30,7 +30,8 @@ MODULE = layout
LIBRARY_NAME = gfx_gtk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
REQUIRES = xpcom string img widget view util dom pref js uconv necko unicharutil gfx2 mozcomps windowwatcher locale intl
MODULE_NAME = nsGfxGTKModule
REQUIRES = xpcom string img widget view util dom pref js uconv necko unicharutil gfx2 mozcomps windowwatcher locale
CSRCS = nsPrintdGTK.c

1
gfx/src/mac/Makefile.in
Просмотреть файл

@ -27,6 +27,7 @@ LIBRARY_NAME = gfx_mac
EXPORT_LIBRARY = 1
MODULE = layout
IS_COMPONENT = 1
MODULE_NAME = nsGfxMacModule
REQUIRES = xpcom string img widget view util dom pref js uconv necko unicharutil gfx2 mozcomps windowwatcher
CPPSRCS = \

52
gfx/src/makefile.win
Просмотреть файл

@ -20,20 +20,16 @@
# Contributor(s):
DEPTH=..\..
MODULE=raptor
DIRS = windows
include <$(DEPTH)\config\config.mak>
MAKE_OBJ_TYPE = DLL
DLLNAME = gkgfxwin
DLL=.\$(OBJDIR)\$(DLLNAME).dll
#RESFILE = $(DLLNAME).res
MODULE=gfx
LIBRARY_NAME=gkgfx
EXPORT_LIBRARY=1
!ifdef NECKO
!else
!endif
#RESFILE = $(DLLNAME).res
DEFINES=-D_IMPL_NS_GFX -DWIN32_LEAN_AND_MEAN
@ -64,8 +60,6 @@ LINCS=-I$(PUBLIC)\util -I$(PUBLIC)\img \
!else
-I$(PUBLIC)\netlib \
!endif
-I$(PUBLIC)\dom \
-I$(PUBLIC)\js \
$(NULL)
LCFLAGS = \
@ -73,43 +67,19 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\img32$(VERSION_NUMBER).lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
$(DIST)\lib\util.lib \
$(DIST)\lib\raptorgfxwin_s.lib \
$(DIST)\lib\timer_s.lib \
!if defined(NGLAYOUT_DDRAW)
$(NGLAYOUT_DDRAW)\lib\ddraw.lib \
!endif
$(LIBNSPR)
LLIBS= \
$(DIST)\lib\img32$(VERSION_NUMBER).lib \
$(DIST)\lib\util.lib \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)
WIN_LIBS= \
!if defined(NGLAYOUT_DDRAW)
ole32.lib \
!endif
comdlg32.lib
LLFLAGS = \
$(LLFLAGS) \
/INCLUDE:_NS_HexToRGB@8 \
/INCLUDE:_NS_ColorNameToRGB@8 \
/INCLUDE:_NS_NewImageGroup@4 \
/INCLUDE:_NS_NewImageRenderer@4 \
/INCLUDE:_NS_NewImageSystemServices@4 \
/INCLUDE:_NS_NewImageManager@4
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
install::
$(MAKE_INSTALL) icon_0.gif $(DIST)\bin\res\gfx
$(MAKE_INSTALL) icon_1.gif $(DIST)\bin\res\gfx
clobber::
rm -f $(DIST)\bin\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib
rm -f $(DIST)\lib\library
rm -f $(DIST)\bin\res\gfx\icon_0.gif
rm -f $(DIST)\bin\res\gfx\icon_1.gif

2
gfx/src/nsBlender.h
Просмотреть файл

@ -38,7 +38,7 @@ typedef enum
//----------------------------------------------------------------------
// Blender interface
class nsBlender : public nsIBlender
class NS_GFX nsBlender : public nsIBlender
{
public:
/** --------------------------------------------------------------------------

8
gfx/src/nsDeviceContext.cpp
Просмотреть файл

@ -847,11 +847,3 @@ nsresult nsFontCache :: Flush()
return NS_OK;
}
#if defined(XP_PC) && !defined(XP_OS2)
// XXX I had to add this because I changed the link order on Windows
void notCalled()
{
nsCID cid;
(void)NSGetFactory(nsnull, cid, nsnull, nsnull, nsnull);
}
#endif

2
gfx/src/nsFontList.h
Просмотреть файл

@ -34,7 +34,7 @@
#define NS_FONTLIST_CONTRACTID "@mozilla.org/gfx/fontlist;1"
class nsFontList : public nsIFontList
class NS_GFX nsFontList : public nsIFontList
{
public:
NS_DEFINE_STATIC_CID_ACCESSOR(NS_IFONTLIST_IID)

2
gfx/src/nsPrintOptionsImpl.h
Просмотреть файл

@ -30,7 +30,7 @@ class nsIPref;
//*****************************************************************************
//*** nsPrintOptions
//*****************************************************************************
class nsPrintOptions : public nsIPrintOptions
class NS_GFX nsPrintOptions : public nsIPrintOptions
{
public:
NS_DECL_ISUPPORTS

2
gfx/src/nsScriptableRegion.h
Просмотреть файл

@ -27,7 +27,7 @@ class nsIRegion;
/**
* An adapter class for the unscriptable nsIRegion interface.
*/
class nsScriptableRegion : public nsIScriptableRegion {
class NS_GFX nsScriptableRegion : public nsIScriptableRegion {
public:
nsScriptableRegion(nsIRegion* region);
virtual ~nsScriptableRegion();

1
gfx/src/os2/Makefile.in
Просмотреть файл

@ -31,6 +31,7 @@ MODULE = layout
LIBRARY_NAME = gfx_os2
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsGfxOS2Module
DIRS = res

2
gfx/src/photon/Makefile.in
Просмотреть файл

@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = layout
LIBRARY_NAME = gfx_photon
IS_COMPONENT = 1
MODULE_NAME = nsGfxPhModule
CPPSRCS = \
nsDeviceContextPh.cpp \

1
gfx/src/ps/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = layout
LIBRARY_NAME = gfxps
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsGfxPSModule
EXTRA_DSO_LIBS = img_s mozutil_s
REQUIRES = xpcom string img widget util pref uconv dom view gfx2 necko imglib2 intl
EXTRA_DSO_LIBS += gkgfx

1
gfx/src/qt/Makefile.in
Просмотреть файл

@ -32,6 +32,7 @@ LIBRARY_NAME = gfx_qt
EXPORT_LIBRARY = 1
REQUIRES = xpcom string widget view gfx2 uconv pref img dom util js appshell mozcomps windowwatcher unicharutil
IS_COMPONENT = 1
MODULE_NAME = nsGfxQTModule
CPPSRCS = \
nsDeviceContextQT.cpp \

34
gfx/src/windows/makefile.win
Просмотреть файл

@ -22,11 +22,11 @@
DEPTH=..\..\..
include <$(DEPTH)/config/config.mak>
MODULE=raptor
MODULE=gfx
LIBRARY_NAME=gkgfxwin
MODULE_NAME=nsGfxModule
LIBRARY_NAME=raptorgfxwin_s
DEFINES=-D_IMPL_NS_GFX -D_IMPL_NS_GFXNONXP -DWIN32_LEAN_AND_MEAN -DSTRICT
DEFINES=-DWIN32_LEAN_AND_MEAN -DSTRICT
!if defined(NGLAYOUT_DDRAW)
DEFINES=$(DEFINES) -DNGLAYOUT_DDRAW
@ -70,13 +70,31 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
LLIBS = \
$(DIST)\lib\gkgfx.lib \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\util.lib \
$(DIST)\lib\img32$(VERSION_NUMBER).lib \
$(DIST)\lib\timer_s.lib \
!if defined(NGLAYOUT_DDRAW)
$(NGLAYOUT_DDRAW)\lib\ddraw.lib \
!endif
$(LIBNSPR) \
$(NULL)
WIN_LIBS= \
!if defined(NGLAYOUT_DDRAW)
ole32.lib \
!endif
comdlg32.lib
LLFLAGS = $(LLFLAGS) \
/INCLUDE:_NS_NewImageManager@4
include <$(DEPTH)\config\rules.mak>
install:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
install::
$(MAKE_INSTALL) fontEncoding.properties $(DIST)\bin\res\fonts
clobber::
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
rm -f $(PDBFILE).pdb
rm -f $(DIST)\bin\res\fonts\fontEncoding.properties

408
gfx/src/windows/nsGfxFactoryWin.cpp
Просмотреть файл

@ -37,44 +37,30 @@
#include "nsScreenManagerWin.h"
#include "nsPrintOptionsWin.h"
#include "nsFontList.h"
#include "nsIGenericFactory.h"
static NS_DEFINE_IID(kCFontMetrics, NS_FONT_METRICS_CID);
static NS_DEFINE_IID(kCFontEnumerator, NS_FONT_ENUMERATOR_CID);
static NS_DEFINE_IID(kCFontList, NS_FONTLIST_CID);
static NS_DEFINE_IID(kCRenderingContext, NS_RENDERING_CONTEXT_CID);
static NS_DEFINE_IID(kCImage, NS_IMAGE_CID);
static NS_DEFINE_IID(kCBlender, NS_BLENDER_CID);
static NS_DEFINE_IID(kCDeviceContext, NS_DEVICE_CONTEXT_CID);
static NS_DEFINE_IID(kCRegion, NS_REGION_CID);
static NS_DEFINE_IID(kCDeviceContextSpec, NS_DEVICE_CONTEXT_SPEC_CID);
static NS_DEFINE_IID(kCDeviceContextSpecFactory, NS_DEVICE_CONTEXT_SPEC_FACTORY_CID);
static NS_DEFINE_IID(kCDrawingSurface, NS_DRAWING_SURFACE_CID);
static NS_DEFINE_IID(kImageManagerImpl, NS_IMAGEMANAGER_CID);
static NS_DEFINE_IID(kCScreenManager, NS_SCREENMANAGER_CID);
static NS_DEFINE_IID(kCPrintOptions, NS_PRINTOPTIONS_CID);
//NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontMetricsWin)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextWin)
//NS_GENERIC_FACTORY_CONSTRUCTOR(nsRenderingContextWin)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsImageWin)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegionWin)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsBlender)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDrawingSurfaceWin)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecWin)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecFactoryWin)
//NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptableRegion)
//NS_GENERIC_FACTORY_CONSTRUCTOR(nsImageManagerImpl)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrintOptionsWin)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontEnumeratorWin)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerWin)
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_IID(kCScriptableRegion, NS_SCRIPTABLE_REGION_CID);
class nsGfxFactoryWin : public nsIFactory
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIFACTORY
nsGfxFactoryWin(const nsCID &aClass);
~nsGfxFactoryWin();
private:
nsCID mClassID;
};
static int gUseAFunctions = 0;
nsGfxFactoryWin::nsGfxFactoryWin(const nsCID &aClass)
{
static int init = 0;
static PRBool
UseAFunctions()
{
static PRBool useAFunctions = PR_FALSE;
static PRBool init = PR_FALSE;
if (!init) {
init = 1;
OSVERSIONINFO os;
@ -84,185 +70,181 @@ nsGfxFactoryWin::nsGfxFactoryWin(const nsCID &aClass)
(os.dwMajorVersion == 4) &&
(os.dwMinorVersion == 0) && // Windows 95 (not 98)
(::GetACP() == 932)) { // Shift-JIS (Japanese)
gUseAFunctions = 1;
useAFunctions = 1;
}
}
NS_INIT_REFCNT();
mClassID = aClass;
}
nsGfxFactoryWin::~nsGfxFactoryWin()
{
}
nsresult nsGfxFactoryWin::QueryInterface(const nsIID &aIID,
void **aResult)
{
if (aResult == NULL) {
return NS_ERROR_NULL_POINTER;
}
// Always NULL result, in case of failure
*aResult = NULL;
if (aIID.Equals(kISupportsIID)) {
*aResult = (void *)(nsISupports*)this;
} else if (aIID.Equals(kIFactoryIID)) {
*aResult = (void *)(nsIFactory*)this;
}
if (*aResult == NULL) {
return NS_NOINTERFACE;
}
AddRef(); // Increase reference count for caller
return NS_OK;
}
NS_IMPL_ADDREF(nsGfxFactoryWin);
NS_IMPL_RELEASE(nsGfxFactoryWin);
nsresult nsGfxFactoryWin::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,
void **aResult)
{
nsresult res;
if (aResult == NULL) {
return NS_ERROR_NULL_POINTER;
}
*aResult = NULL;
nsISupports *inst = nsnull;
PRBool already_addreffed = PR_FALSE;
if (mClassID.Equals(kCFontMetrics)) {
nsFontMetricsWin* fm;
if (gUseAFunctions) {
NS_NEWXPCOM(fm, nsFontMetricsWinA);
}
else {
NS_NEWXPCOM(fm, nsFontMetricsWin);
}
inst = (nsISupports *)fm;
}
else if (mClassID.Equals(kCDeviceContext)) {
nsDeviceContextWin* dc;
NS_NEWXPCOM(dc, nsDeviceContextWin);
inst = (nsISupports *)dc;
}
else if (mClassID.Equals(kCRenderingContext)) {
nsRenderingContextWin* rc;
if (gUseAFunctions) {
NS_NEWXPCOM(rc, nsRenderingContextWinA);
}
else {
NS_NEWXPCOM(rc, nsRenderingContextWin);
}
inst = (nsISupports *)((nsIRenderingContext*)rc);
}
else if (mClassID.Equals(kCImage)) {
nsImageWin* image;
NS_NEWXPCOM(image, nsImageWin);
inst = (nsISupports *)image;
}
else if (mClassID.Equals(kCRegion)) {
nsRegionWin* region;
NS_NEWXPCOM(region, nsRegionWin);
inst = (nsISupports *)region;
}
else if (mClassID.Equals(kCBlender)) {
nsBlender* blender;
NS_NEWXPCOM(blender, nsBlender);
inst = (nsISupports *)blender;
}
else if (mClassID.Equals(kCDrawingSurface)) {
nsDrawingSurfaceWin* ds;
NS_NEWXPCOM(ds, nsDrawingSurfaceWin);
inst = (nsISupports *)((nsIDrawingSurface *)ds);
}
else if (mClassID.Equals(kCDeviceContextSpec)) {
nsDeviceContextSpecWin* dcs;
NS_NEWXPCOM(dcs, nsDeviceContextSpecWin);
inst = (nsISupports *)dcs;
}
else if (mClassID.Equals(kCDeviceContextSpecFactory)) {
nsDeviceContextSpecFactoryWin* dcs;
NS_NEWXPCOM(dcs, nsDeviceContextSpecFactoryWin);
inst = (nsISupports *)dcs;
}
else if (mClassID.Equals(kCScriptableRegion)) {
nsCOMPtr<nsIRegion> rgn;
NS_NEWXPCOM(rgn, nsRegionWin);
if (rgn != nsnull) {
nsIScriptableRegion* scriptableRgn = new nsScriptableRegion(rgn);
inst = (nsISupports *)scriptableRgn;
}
}
else if (mClassID.Equals(kImageManagerImpl)) {
nsCOMPtr<nsIImageManager> iManager;
res = NS_NewImageManager(getter_AddRefs(iManager));
already_addreffed = PR_TRUE;
if (NS_SUCCEEDED(res))
{
res = iManager->QueryInterface(NS_GET_IID(nsISupports), (void**)&inst);
}
}
else if (mClassID.Equals(kCPrintOptions)) {
NS_NEWXPCOM(inst, nsPrintOptionsWin);
}
else if (mClassID.Equals(kCFontEnumerator)) {
nsFontEnumeratorWin* fe;
NS_NEWXPCOM(fe, nsFontEnumeratorWin);
inst = (nsISupports *)fe;
}
else if (mClassID.Equals(kCFontList)) {
nsFontList* fl;
NS_NEWXPCOM(fl, nsFontList);
inst = (nsISupports *)fl;
}
else if (mClassID.Equals(kCScreenManager)) {
NS_NEWXPCOM(inst, nsScreenManagerWin);
}
if (inst == NULL) {
return NS_ERROR_OUT_OF_MEMORY;
}
if (already_addreffed == PR_FALSE)
NS_ADDREF(inst); // Stabilize
res = inst->QueryInterface(aIID, aResult);
NS_RELEASE(inst); // Destabilize and avoid leaks. Avoid calling delete <interface pointer>
return res;
}
nsresult nsGfxFactoryWin::LockFactory(PRBool aLock)
{
// Not implemented in simplest case.
return NS_OK;
}
// return the proper factory to the caller
extern "C" NS_GFXNONXP nsresult NSGetFactory(nsISupports* servMgr,
const nsCID &aClass,
const char *aClassName,
const char *aContractID,
nsIFactory **aFactory)
{
if (nsnull == aFactory) {
return NS_ERROR_NULL_POINTER;
}
*aFactory = new nsGfxFactoryWin(aClass);
if (nsnull == aFactory) {
return NS_ERROR_OUT_OF_MEMORY;
}
return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory);
return useAFunctions;
}
static NS_IMETHODIMP
nsFontMetricsWinConstructor(nsISupports* aOuter, REFNSIID aIID, void** aResult)
{
*aResult = nsnull;
if (aOuter)
return NS_ERROR_NO_AGGREGATION;
nsFontMetricsWin* result;
if (UseAFunctions())
result = new nsFontMetricsWinA();
else
result = new nsFontMetricsWin();
if (! result)
return NS_ERROR_OUT_OF_MEMORY;
nsresult rv;
NS_ADDREF(result);
rv = result->QueryInterface(aIID, aResult);
NS_RELEASE(result);
return rv;
}
static NS_IMETHODIMP
nsRenderingContextWinConstructor(nsISupports* aOuter, REFNSIID aIID, void** aResult)
{
*aResult = nsnull;
if (aOuter)
return NS_ERROR_NO_AGGREGATION;
nsRenderingContextWin* result;
if (UseAFunctions())
result = new nsRenderingContextWinA();
else
result = new nsRenderingContextWin();
if (! result)
return NS_ERROR_OUT_OF_MEMORY;
nsresult rv;
NS_ADDREF(result);
rv = result->QueryInterface(aIID, aResult);
NS_RELEASE(result);
return rv;
}
static NS_IMETHODIMP
nsScriptableRegionConstructor(nsISupports* aOuter, REFNSIID aIID, void** aResult)
{
*aResult = nsnull;
if (aOuter)
return NS_ERROR_NO_AGGREGATION;
nsRegionWin* region = new nsRegionWin();
if (! region)
return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(region);
nsresult rv = NS_ERROR_OUT_OF_MEMORY;
nsScriptableRegion* result = new nsScriptableRegion(region);
if (result) {
NS_ADDREF(result);
rv = result->QueryInterface(aIID, aResult);
NS_RELEASE(result);
}
NS_RELEASE(region);
return rv;
}
static NS_IMETHODIMP
nsImageManagerImplConstructor(nsISupports* aOuter, REFNSIID aIID, void** aResult)
{
*aResult = nsnull;
if (aOuter)
return NS_ERROR_NO_AGGREGATION;
nsresult rv;
nsCOMPtr<nsIImageManager> result;
rv = NS_NewImageManager(getter_AddRefs(result));
if (result)
rv = result->QueryInterface(aIID, aResult);
return rv;
}
static nsModuleComponentInfo components[] =
{
{ "nsFontMetricsWin",
NS_FONT_METRICS_CID,
"@mozilla.org/gfx/fontmetrics;1",
nsFontMetricsWinConstructor },
{ "nsDeviceContextWin",
NS_DEVICE_CONTEXT_CID,
"@mozilla.org/gfx/devicecontext;1",
nsDeviceContextWinConstructor },
{ "nsRenderingContextWin",
NS_RENDERING_CONTEXT_CID,
"@mozilla.org/gfx/renderingcontext;1",
nsRenderingContextWinConstructor },
{ "nsImageWin",
NS_IMAGE_CID,
"@mozilla.org/gfx/image;1",
nsImageWinConstructor },
{ "nsRegionWin",
NS_REGION_CID,
"@mozilla.org/gfx/unscriptable-region;1",
nsRegionWinConstructor },
{ "nsBlender",
NS_BLENDER_CID,
"@mozilla.org/gfx/blender;1",
nsBlenderConstructor },
{ "nsDrawingSurfaceWin",
NS_DRAWING_SURFACE_CID,
"@mozilla.org/gfx/drawing-surface;1",
nsDrawingSurfaceWinConstructor },
{ "nsDeviceContextSpecWin",
NS_DEVICE_CONTEXT_SPEC_CID,
"@mozilla.org/gfx/devicecontextspec;1",
nsDeviceContextSpecWinConstructor },
{ "nsDeviceContextSpecFactoryWin",
NS_DEVICE_CONTEXT_SPEC_FACTORY_CID,
"@mozilla.org/gfx/devicecontextspecfactory;1",
nsDeviceContextSpecFactoryWinConstructor },
{ "nsScriptableRegion",
NS_SCRIPTABLE_REGION_CID,
"@mozilla.org/gfx/region;1",
nsScriptableRegionConstructor },
{ "nsImageManagerImpl",
NS_IMAGEMANAGER_CID,
"@mozilla.org/gfx/imagemanager;1",
nsImageManagerImplConstructor },
{ "nsPrintOptionsWin",
NS_PRINTOPTIONS_CID,
"@mozilla.org/gfx/printoptions;1",
nsPrintOptionsWinConstructor },
{ "nsFontEnumeratorWin",
NS_FONT_ENUMERATOR_CID,
"@mozilla.org/gfx/fontenumerator;1",
nsFontEnumeratorWinConstructor },
{ "nsFontList",
NS_FONTLIST_CID,
"@mozilla.org/gfx/fontlist;1",
nsFontListConstructor },
{ "nsScreenManagerWin",
NS_SCREENMANAGER_CID,
"@mozilla.org/gfx/screenmanager;1",
nsScreenManagerWinConstructor },
};
NS_IMPL_NSGETMODULE(nsGfxModule, components)

2
gfx/src/xlib/Makefile.in
Просмотреть файл

@ -30,6 +30,8 @@ MODULE = layout
LIBRARY_NAME = gfx_xlib
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsGfxXlibModule
REQUIRES = xpcom string xlibrgb widget dom layout appshell js necko pref img util view uconv locale unicharutil gfx2 mozcomps windowwatcher
CPPSRCS = \

2
gfx/src/xprint/Makefile.in
Просмотреть файл

@ -31,6 +31,8 @@ MODULE = layout
LIBRARY_NAME = gfxxprint
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsGfxXprintModule
EXTRA_DSO_LIBS = gkgfx
REQUIRES = xpcom string widget view img util dom pref locale uconv unicharutil gfx2 necko imglib2 intl

96
gfx/src/xprint/nsFontMetricsXP.cpp
Просмотреть файл

@ -70,15 +70,15 @@ static int gInitialized = 0;
struct nsFontCharSetMap;
struct nsFontFamilyName;
struct nsFontPropertyName;
struct nsFontStyle;
struct nsFontWeight;
struct nsFontXpStyle;
struct nsFontXpWeight;
class nsFontNodeArray : public nsVoidArray
class nsFontXpNodeArray : public nsVoidArray
{
public:
nsFontNode* GetElement(PRInt32 aIndex)
nsFontXpNode* GetElement(PRInt32 aIndex)
{
return (nsFontNode*) ElementAt(aIndex);
return (nsFontXpNode*) ElementAt(aIndex);
};
};
@ -102,7 +102,7 @@ struct nsFontFamily
{
NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
nsFontNodeArray mNodes;
nsFontXpNodeArray mNodes;
};
struct nsFontFamilyName
@ -111,7 +111,7 @@ struct nsFontFamilyName
char* mXName;
};
struct nsFontNode
struct nsFontXpNode
{
NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
@ -119,7 +119,7 @@ struct nsFontNode
nsCAutoString mName;
nsFontCharSetInfo* mCharSetInfo;
nsFontStyle* mStyles[3];
nsFontXpStyle* mStyles[3];
PRUint8 mHolesFilled;
PRUint8 mDummy;
};
@ -130,7 +130,7 @@ struct nsFontPropertyName
int mValue;
};
struct nsFontStretch
struct nsFontXpStretch
{
NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
@ -148,22 +148,22 @@ struct nsFontStretch
};
struct nsFontStyle
struct nsFontXpStyle
{
NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
void FillWeightHoles(void);
nsFontWeight* mWeights[9];
nsFontXpWeight* mWeights[9];
};
struct nsFontWeight
struct nsFontXpWeight
{
NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
void FillStretchHoles(void);
nsFontStretch* mStretches[9];
nsFontXpStretch* mStretches[9];
};
// Global variables
@ -173,7 +173,7 @@ static nsIPref* gPref = nsnull;
static nsICharsetConverterManager2* gCharSetManager = nsnull;
static nsIUnicodeEncoder* gUserDefinedConverter = nsnull;
static nsFontNodeArray* gGlobalList = nsnull;
static nsFontXpNodeArray* gGlobalList = nsnull;
static nsIAtom* gUnicode = nsnull;
static nsIAtom* gUserDefined = nsnull;
@ -501,7 +501,7 @@ FreeFamily(nsHashKey* aKey, void* aData, void* aClosure)
}
static void
FreeStretch(nsFontStretch* aStretch)
FreeStretch(nsFontXpStretch* aStretch)
{
PR_smprintf_free(aStretch->mScalable);
@ -518,9 +518,9 @@ FreeStretch(nsFontStretch* aStretch)
}
static void
FreeWeights(nsFontWeight* aWeight)
FreeWeights(nsFontXpWeight* aWeight)
{
nsFontStretch** stretches=aWeight->mStretches;
nsFontXpStretch** stretches=aWeight->mStretches;
for (int i=0; i < 9; i++)
{
if (stretches[i])
@ -537,9 +537,9 @@ FreeWeights(nsFontWeight* aWeight)
}
static void
FreeStyle(nsFontStyle* aStyle)
FreeStyle(nsFontXpStyle* aStyle)
{
nsFontWeight** weights=aStyle->mWeights;
nsFontXpWeight** weights=aStyle->mWeights;
for (int i=0; i < 9; i++)
{
if (weights[i])
@ -558,7 +558,7 @@ FreeStyle(nsFontStyle* aStyle)
static PRBool
FreeNode(nsHashKey* aKey, void* aData, void* aClosure)
{
nsFontNode* node = (nsFontNode*) aData;
nsFontXpNode* node = (nsFontXpNode*) aData;
for (int i=0; i < 3; i++)
{
if (node->mStyles[i])
@ -1509,15 +1509,15 @@ static void
DumpFamily(nsFontFamily* aFamily)
{
for (int styleIndex = 0; styleIndex < 3; styleIndex++) {
nsFontStyle* style = aFamily->mStyles[styleIndex];
nsFontXpStyle* style = aFamily->mStyles[styleIndex];
if (style) {
PR_LOG(FontMetricsXpLM, PR_LOG_DEBUG, (" style: %s\n", gDumpStyles[styleIndex]));
for (int weightIndex = 0; weightIndex < 8; weightIndex++) {
nsFontWeight* weight = style->mWeights[weightIndex];
nsFontXpWeight* weight = style->mWeights[weightIndex];
if (weight) {
PR_LOG(FontMetricsXpLM, PR_LOG_DEBUG, (" weight: %d\n", (weightIndex + 1) * 100));
for (int stretchIndex = 0; stretchIndex < 9; stretchIndex++) {
nsFontStretch* stretch = weight->mStretches[stretchIndex];
nsFontXpStretch* stretch = weight->mStretches[stretchIndex];
if (stretch) {
PR_LOG(FontMetricsXpLM, PR_LOG_DEBUG, (" stretch: %d\n", stretchIndex + 1));
PL_HashTableEnumerateEntries(stretch->mCharSets, DumpCharSet,
@ -2120,7 +2120,7 @@ nsFontXpUserDefined::GetBoundingMetrics(const PRUnichar* aString,
// Continue nsFontMetricsXp Implementation
nsFontXp*
nsFontMetricsXp::PickASizeAndLoad(nsFontStretch* aStretch,
nsFontMetricsXp::PickASizeAndLoad(nsFontXpStretch* aStretch,
nsFontCharSetInfo* aCharSet,
PRUnichar aChar)
{
@ -2274,13 +2274,13 @@ CompareSizes(const void* aArg1, const void* aArg2, void *data)
}
void
nsFontStretch::SortSizes(void)
nsFontXpStretch::SortSizes(void)
{
NS_QuickSort(mSizes, mSizesCount, sizeof(*mSizes), CompareSizes, NULL);
}
void
nsFontWeight::FillStretchHoles(void)
nsFontXpWeight::FillStretchHoles(void)
{
int i, j;
@ -2346,7 +2346,7 @@ nsFontWeight::FillStretchHoles(void)
}
void
nsFontStyle::FillWeightHoles(void)
nsFontXpStyle::FillWeightHoles(void)
{
int i, j;
@ -2416,7 +2416,7 @@ nsFontStyle::FillWeightHoles(void)
}
void
nsFontNode::FillStyleHoles(void)
nsFontXpNode::FillStyleHoles(void)
{
if (mHolesFilled) {
return;
@ -2479,7 +2479,7 @@ nsFontNode::FillStyleHoles(void)
} while (0)
nsFontXp*
nsFontMetricsXp::SearchNode(nsFontNode* aNode, PRUnichar aChar)
nsFontMetricsXp::SearchNode(nsFontXpNode* aNode, PRUnichar aChar)
{
if (aNode->mDummy)
return nsnull;
@ -2522,9 +2522,9 @@ nsFontMetricsXp::SearchNode(nsFontNode* aNode, PRUnichar aChar)
}
aNode->FillStyleHoles();
nsFontStyle* style = aNode->mStyles[mStyleIndex];
nsFontXpStyle* style = aNode->mStyles[mStyleIndex];
nsFontWeight** weights = style->mWeights;
nsFontXpWeight** weights = style->mWeights;
int weight = mFont->weight;
int steps = (weight % 100);
int weightIndex;
@ -2536,7 +2536,7 @@ nsFontMetricsXp::SearchNode(nsFontNode* aNode, PRUnichar aChar)
GET_WEIGHT_INDEX(weightIndex, base);
while (steps--)
{
nsFontWeight* prev = weights[weightIndex];
nsFontXpWeight* prev = weights[weightIndex];
for (weightIndex++; weightIndex < 9; weightIndex++)
{
if (weights[weightIndex] != prev)
@ -2553,7 +2553,7 @@ nsFontMetricsXp::SearchNode(nsFontNode* aNode, PRUnichar aChar)
GET_WEIGHT_INDEX(weightIndex, base);
while (steps--)
{
nsFontWeight* prev = weights[weightIndex];
nsFontXpWeight* prev = weights[weightIndex];
for (weightIndex--; weightIndex >=0; weightIndex--)
{
if (weights[weightIndex] != prev)
@ -2574,7 +2574,7 @@ nsFontMetricsXp::SearchNode(nsFontNode* aNode, PRUnichar aChar)
}
static void
GetFontNames(const char* aPattern, nsFontNodeArray* aNodes)
GetFontNames(const char* aPattern, nsFontXpNodeArray* aNodes)
{
nsCAutoString previousNodeName;
@ -2702,11 +2702,11 @@ GetFontNames(const char* aPattern, nsFontNodeArray* aNodes)
nodeName.Append(charSetName);
nsCStringKey key(nodeName);
nsFontNode* node = (nsFontNode*) gNodes->Get(&key);
nsFontXpNode* node = (nsFontXpNode*) gNodes->Get(&key);
if (!node)
{
node = new nsFontNode;
node = new nsFontXpNode;
if (!node)
continue;
gNodes->Put(&key, node);
@ -2745,9 +2745,9 @@ GetFontNames(const char* aPattern, nsFontNodeArray* aNodes)
styleIndex = NS_FONT_STYLE_NORMAL;
break;
}
nsFontStyle* style = node->mStyles[styleIndex];
nsFontXpStyle* style = node->mStyles[styleIndex];
if (!style) {
style = new nsFontStyle;
style = new nsFontXpStyle;
if (!style) {
continue;
}
@ -2762,9 +2762,9 @@ GetFontNames(const char* aPattern, nsFontNodeArray* aNodes)
weightNumber = NS_FONT_WEIGHT_NORMAL;
}
int weightIndex = WEIGHT_INDEX(weightNumber);
nsFontWeight* weight = style->mWeights[weightIndex];
nsFontXpWeight* weight = style->mWeights[weightIndex];
if (!weight) {
weight = new nsFontWeight;
weight = new nsFontXpWeight;
if (!weight) {
continue;
}
@ -2779,9 +2779,9 @@ GetFontNames(const char* aPattern, nsFontNodeArray* aNodes)
stretchIndex = 5;
}
stretchIndex--;
nsFontStretch* stretch = weight->mStretches[stretchIndex];
nsFontXpStretch* stretch = weight->mStretches[stretchIndex];
if (!stretch) {
stretch = new nsFontStretch;
stretch = new nsFontXpStretch;
if (!stretch) {
continue;
}
@ -2886,7 +2886,7 @@ GetAllFontNames(void)
{
if(!gGlobalList)
{
gGlobalList = new nsFontNodeArray();
gGlobalList = new nsFontXpNodeArray();
if (!gGlobalList)
{
return NS_ERROR_OUT_OF_MEMORY;
@ -2960,7 +2960,7 @@ nsFontXp*
nsFontMetricsXp::TryNode(nsCString* aName, PRUnichar aChar)
{
nsCStringKey key(*aName);
nsFontNode* node = (nsFontNode*) gNodes->Get(&key);
nsFontXpNode* node = (nsFontXpNode*) gNodes->Get(&key);
if (!node)
{
nsCAutoString pattern("-");
@ -2973,14 +2973,14 @@ nsFontMetricsXp::TryNode(nsCString* aName, PRUnichar aChar)
pattern.Insert("-*-*-*-*-*-*-*-*-*-*", hyphen);
nsFontNodeArray nodes;
nsFontXpNodeArray nodes;
GetFontNames(pattern.get(), &nodes);
if (nodes.Count() > 0)
node = nodes.GetElement(0);
else
{
// add a dummy node to the hash table to avoid calling XListFonts again
node = new nsFontNode();
node = new nsFontXpNode();
if (!node)
return nsnull;
gNodes->Put(&key, node);
@ -3015,7 +3015,7 @@ nsFontMetricsXp::TryFamily(nsCString* aName, PRUnichar aChar)
nsFontFamily* family = FindFamily(aName);
if (family)
{
nsFontNodeArray* nodes = &family->mNodes;
nsFontXpNodeArray* nodes = &family->mNodes;
PRInt32 n = nodes->Count();
for (PRInt32 i=0; i < n; i++)
{
@ -3284,7 +3284,7 @@ typedef struct EnumerateNodeInfo
static PRIntn
EnumerateNode(void* aElement, void* aData)
{
nsFontNode* node = (nsFontNode*) aElement;
nsFontXpNode* node = (nsFontXpNode*) aElement;
EnumerateNodeInfo* info = (EnumerateNodeInfo*) aData;

8
gfx/src/xprint/nsFontMetricsXP.h
Просмотреть файл

@ -61,8 +61,8 @@ typedef int (*nsFontCharSetConverter)(nsFontCharSetInfo* aSelf,
struct nsFontCharSet;
struct nsFontFamily;
struct nsFontNode;
struct nsFontStretch;
struct nsFontXpNode;
struct nsFontXpStretch;
class nsFontXpUserDefined;
@ -158,12 +158,12 @@ public:
nsFontXp* FindGlobalFont(PRUnichar aChar);
nsFontXp* FindSubstituteFont(PRUnichar aChar);
nsFontXp* SearchNode(nsFontNode* aNode, PRUnichar aChar);
nsFontXp* SearchNode(nsFontXpNode* aNode, PRUnichar aChar);
nsFontXp* TryAliases(nsCString* aName, PRUnichar aChar);
nsFontXp* TryFamily(nsCString* aName, PRUnichar aChar);
nsFontXp* TryNode(nsCString* aName, PRUnichar aChar);
nsFontXp* PickASizeAndLoad(nsFontStretch* aStretch,
nsFontXp* PickASizeAndLoad(nsFontXpStretch* aStretch,
nsFontCharSetInfo* aCharSet,
PRUnichar aChar);

2
gfx/tests/btest/makefile.win
Просмотреть файл

@ -29,7 +29,7 @@ PROGRAMS = $(PROG0)
LINCS=-I$(XPDIST)\public\raptor -I$(XPDIST)\public\xpcom -I..\src
LLIBS= \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\gkgfx.lib \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR) \
$(DIST)\lib\img32$(VERSION_NUMBER).lib \

2
gfx/tests/coverage/makefile.win
Просмотреть файл

@ -38,7 +38,7 @@ LLIBS= \
$(LIBNSPR) \
$(DIST)\lib\widgetsupport_s.lib \
$(DIST)\lib\gkwidget.lib \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\gkgfx.lib \
$(NULL)
LLFLAGS=-SUBSYSTEM:CONSOLE

2
gfx/tests/makefile.win
Просмотреть файл

@ -33,7 +33,7 @@ PROGRAMS = $(PROG1) $(PROG2) $(PROG3)
LINCS=-I$(XPDIST)\public\raptor -I$(XPDIST)\public\xpcom -I..\src
LLIBS= \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\gkgfx.lib \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

1
gfx2/src/Makefile.in
Просмотреть файл

@ -31,6 +31,7 @@ MODULE = gfx2
LIBRARY_NAME = gfx2
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsGfx2Module
REQUIRES = xpcom layout

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше