mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 13:51:41 +00:00
Added support for building select individual modules using --enable-modules. Currently, only dbm, xpcom & necko work. At this point, you still have to pull the whole tree. We'll fix that later. Bugs 24515 & 34159
This commit is contained in:
cls%seawood.org
parent
487c403462
commit
c4a7fe96b1
22
Makefile.in
22
Makefile.in
@ -26,9 +26,16 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
include $(topsrcdir)/build/unix/modules.mk
|
||||
|
||||
ifneq ($(BUILD_MODULES),all)
|
||||
|
||||
DIRS = $(BUILD_MODULE_DIRS)
|
||||
|
||||
else
|
||||
|
||||
DIRS = config build
|
||||
|
||||
#
|
||||
ifdef MOZ_L10N
|
||||
DIRS += l10n
|
||||
endif
|
||||
@ -40,16 +47,7 @@ DIRS += \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifndef MOZ_NATIVE_NSPR
|
||||
# Do not regenerate Makefile for NSPR
|
||||
ifdef USE_NSPR_AUTOCONF
|
||||
DIRS += nsprpub
|
||||
STATIC_MAKEFILES := nsprpub
|
||||
else
|
||||
DIRS += $(topsrcdir)/nsprpub
|
||||
STATIC_MAKEFILES := $(topsrcdir)/nsprpub
|
||||
endif
|
||||
endif
|
||||
DIRS += $(NSPRPUB_DIR)
|
||||
|
||||
# boehm needs to be built before XPCOM
|
||||
ifdef GC_LEAK_DETECTOR
|
||||
@ -124,6 +122,8 @@ ifdef ENABLE_TESTS
|
||||
DIRS += xpcom/tests
|
||||
endif
|
||||
|
||||
endif # BUILD_MODULES == all
|
||||
|
||||
GARBAGE += dist
|
||||
DIST_GARBAGE = config.cache config.log config.status config-defs.h \
|
||||
dependencies.beos config/autoconf.mk \
|
||||
|
||||
59
build/unix/modules.mk
Normal file
59
build/unix/modules.mk
Normal file
@ -0,0 +1,59 @@
|
||||
#
|
||||
# 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 Original Code is build/unix/modules.mk from the Mozilla source tree.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Christopher
|
||||
# Seawood. Portions created by Christopher Seawood are
|
||||
# Copyright (C) 2000 Christopher Seawood. All Rights Reserved.
|
||||
#
|
||||
#
|
||||
|
||||
BUILD_MODULE_DIRS := config build
|
||||
_BUILD_MODS =
|
||||
NSPRPUB_DIR =
|
||||
|
||||
ifndef MOZ_NATIVE_NSPR
|
||||
# Do not regenerate Makefile for NSPR
|
||||
ifdef USE_NSPR_AUTOCONF
|
||||
NSPRPUB_DIR = nsprpub
|
||||
STATIC_MAKEFILES := nsprpub
|
||||
else
|
||||
NSPRPUB_DIR = $(topsrcdir)/nsprpub
|
||||
STATIC_MAKEFILES := $(topsrcdir)/nsprpub
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(BUILD_MODULES),all)
|
||||
|
||||
ifdef CROSS_COMPILE
|
||||
BUILD_MODULE_DIRS_js = $(NSPRPUB_DIR)
|
||||
endif
|
||||
|
||||
BUILD_MODULE_DIRS_dbm = $(NSPRPUB_DIR) dbm
|
||||
BUILD_MODULE_DIRS_js += js
|
||||
BUILD_MODULE_DIRS_xpcom = $(NSPRPUB_DIR) modules/libreg xpcom intl/unicharutil/public intl/uconv/public
|
||||
BUILD_MODULE_DIRS_necko = $(BUILD_MODULE_DIRS_xpcom) netwerk
|
||||
|
||||
|
||||
BUILD_MODULE_DIRS += $(foreach mod,$(BUILD_MODULES), $(BUILD_MODULE_DIRS_$(mod)))
|
||||
|
||||
# Remove dups from the list to speed up the build
|
||||
#
|
||||
BUILD_MODULE_DIRS := $(shell $(PERL) -e 'undef @out; \
|
||||
foreach $$d (@ARGV) { \
|
||||
push @out, $$d if (!grep(/$$d/, @out)); \
|
||||
}; \
|
||||
print "@out\n"; ' $(BUILD_MODULE_DIRS))
|
||||
|
||||
endif # BUILD_MODULES
|
||||
|
||||
|
||||
@ -24,6 +24,7 @@ INCLUDED_AUTOCONF_MK = 1
|
||||
USE_AUTOCONF = 1
|
||||
MOZILLA_CLIENT = 1
|
||||
NO_MDUPDATE = 1
|
||||
BUILD_MODULES = @BUILD_MODULES@
|
||||
|
||||
DIST = $(DEPTH)/dist
|
||||
|
||||
|
||||
18
configure.in
18
configure.in
@ -13,8 +13,7 @@ dnl The Original Code is this file as it was released upon August 6, 1998.
|
||||
dnl
|
||||
dnl The Initial Developer of the Original Code is Christopher
|
||||
dnl Seawood. Portions created by Christopher Seawood are
|
||||
dnl Copyright (C) 1998 Christopher Seawood. All
|
||||
dnl Rights Reserved.
|
||||
dnl Copyright (C) 1998-2000 Christopher Seawood. All Rights Reserved.
|
||||
dnl
|
||||
dnl Contributor(s): Jamie Zawinski <jwz@jwz.org>
|
||||
dnl gettimeofday args check
|
||||
@ -2638,6 +2637,20 @@ dnl = End MOZ_MONOLITHIC_TOOLKIT hacks
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = --enable-modules=mod1,mod2
|
||||
dnl =
|
||||
dnl = Only selectively build modules
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
BUILD_MODULES=all
|
||||
MOZ_ARG_ENABLE_STRING(modules,
|
||||
[ --enable-modules Enable build of specific modules],
|
||||
[ BUILD_MODULES=`echo $enableval | sed 's/,/ /g'` ] )
|
||||
dnl ========================================================
|
||||
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = --diable-pic-dso-cflags
|
||||
@ -3192,6 +3205,7 @@ AC_SUBST(MOZ_TIMER_LIBS)
|
||||
AC_SUBST(MOZ_JS_LIBS)
|
||||
AC_SUBST(MOZ_SECURITY)
|
||||
dnl AC_SUBST(MOZ_NETCAST)
|
||||
AC_SUBST(BUILD_MODULES)
|
||||
AC_SUBST(MOZ_DEBUG)
|
||||
AC_SUBST(MOZ_DEBUG_MODULES)
|
||||
AC_SUBST(MOZ_EXTENSIONS)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user