2006-08-29 20:53:40 +04:00
|
|
|
# ***** BEGIN LICENSE BLOCK *****
|
|
|
|
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
|
|
|
#
|
|
|
|
# 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 the Mozilla build system.
|
|
|
|
#
|
|
|
|
# The Initial Developer of the Original Code is
|
|
|
|
# the Mozilla Foundation <http://www.mozilla.org/>.
|
|
|
|
# Portions created by the Initial Developer are Copyright (C) 2006
|
|
|
|
# the Initial Developer. All Rights Reserved.
|
|
|
|
#
|
|
|
|
# Contributor(s):
|
2006-12-11 12:45:41 +03:00
|
|
|
# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
|
2006-08-29 20:53:40 +04:00
|
|
|
#
|
|
|
|
# Alternatively, the contents of this file may be used under the terms of
|
|
|
|
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
|
|
|
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
|
|
|
# in which case the provisions of the GPL or the LGPL are applicable instead
|
|
|
|
# of those above. If you wish to allow use of your version of this file only
|
|
|
|
# under the terms of either the GPL or the LGPL, and not to allow others to
|
|
|
|
# use your version of this file under the terms of the MPL, indicate your
|
|
|
|
# decision by deleting the provisions above and replace them with the notice
|
|
|
|
# and other provisions required by the GPL or the LGPL. If you do not delete
|
|
|
|
# the provisions above, a recipient may use your version of this file under
|
|
|
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
|
|
|
#
|
|
|
|
# ***** END LICENSE BLOCK *****
|
|
|
|
|
|
|
|
ifdef LIBXUL_SDK
|
|
|
|
$(error toolkit-tiers.mk is not compatible with --enable-libxul-sdk=)
|
|
|
|
endif
|
|
|
|
|
|
|
|
include $(topsrcdir)/config/nspr/build.mk
|
Bug 97954: Allow SpiderMonkey to be built on its own, or as part of Mozilla.
Give SpiderMonkey its own configure script and top-level Makefile.
Adjust js/src/Makefile as appropriate for life as a stand-alone
makefile, instead of a 'make export; make libs'-style Mozilla tier
makefile. Have the configure script accept '--with-nspr-cflags' and
'--with-nspr-libs' options for using an in-tree NSPR. Also accept
'--with-system-nspr', '--with-nspr-prefix', and
'--with-nspr-exec-prefix' flags for using an installed NSPR. Default
to --disable-jemalloc, assuming we don't have that part of the tree
available; have the top-level configure script pass --enable-jemalloc
as needed.
Since we no longer have an export phase to copy header files into
dist/include/js before we build the library, we need to be able to
find nanojit.h in the nanojit directory; fix references in
jsbuiltins.h and jstracer.cpp.
Give SpiderMonkey it its own copies of many of the files from ./config
and ./build. These are all exact copies, except as follows:
. js/src/config/Makefile.in: js/src only has a subset of
js/src/config, and thus a subset of the makefile targets.
. js/src/config/autoconf.mk.in: js/src/configure.in has its own make
variables to set, not set by the top-level configure script, so it
needs a custom automake.mk template.
. js/src/config/make-system-wrappers.pl: a copy from nsprpub/config,
so that we can build without having an NSPR source tree handy.
Invoke js/src/configure from ./configure, passing the values computed
for NSPR_CFLAGS and NSPR_LIBS by the top-level configure script.
Treat js/src as a static directory of the js tier, and create a new
config/js (just a Makefile) to be the js tier's non-static directory.
Let js/src/configure generate SpiderMonkey's makefiles, not
./configure.
Generate a 'js-config' script, which clients can call to find the
CFLAGS and LIBS values necessary to compile and link against an
installed SpiderMonkey library. Don't include the js-config script in
Macintosh packages.
Teach client.mk how to rebuild js/src/configure.
Tell Mercurial to ignore files generated by autoconf in js/src.
Further work:
. Right now, callers must define JS_THREADSAFE when #including jsapi.h.
This is fixed in a subsequent patch.
. js/src/configure is a trimmed copy of ./configure. It could be
trimmed more.
--HG--
rename : build/autoconf/acoutput-fast.pl => js/src/build/autoconf/acoutput-fast.pl
rename : build/autoconf/altoptions.m4 => js/src/build/autoconf/altoptions.m4
rename : build/autoconf/config.guess => js/src/build/autoconf/config.guess
rename : build/autoconf/config.sub => js/src/build/autoconf/config.sub
rename : build/autoconf/glib.m4 => js/src/build/autoconf/glib.m4
rename : build/autoconf/install-sh => js/src/build/autoconf/install-sh
rename : build/autoconf/make-makefile => js/src/build/autoconf/make-makefile
rename : build/autoconf/match-dir.sh => js/src/build/autoconf/match-dir.sh
rename : build/autoconf/nspr.m4 => js/src/build/autoconf/nspr.m4
rename : build/autoconf/pkg.m4 => js/src/build/autoconf/pkg.m4
rename : build/autoconf/update-makefile.sh => js/src/build/autoconf/update-makefile.sh
rename : build/cygwin-wrapper => js/src/build/cygwin-wrapper
rename : build/hcc => js/src/build/hcc
rename : build/hcpp => js/src/build/hcpp
rename : build/unix/mddepend.pl => js/src/build/unix/mddepend.pl
rename : build/unix/uniq.pl => js/src/build/unix/uniq.pl
rename : config/Makefile.in => js/src/config/Makefile.in
rename : config/Moz/Milestone.pm => js/src/config/Moz/Milestone.pm
rename : config/autoconf.mk.in => js/src/config/autoconf.mk.in
rename : config/config.mk => js/src/config/config.mk
rename : config/elf-dynstr-gc.c => js/src/config/elf-dynstr-gc.c
rename : config/fastcwd.pl => js/src/config/fastcwd.pl
rename : config/gcc_hidden.h => js/src/config/gcc_hidden.h
rename : config/insure.mk => js/src/config/insure.mk
rename : nsprpub/config/make-system-wrappers.pl => js/src/config/make-system-wrappers.pl
rename : config/milestone.pl => js/src/config/milestone.pl
rename : config/milestone.txt => js/src/config/milestone.txt
rename : config/mkdepend/Makefile.in => js/src/config/mkdepend/Makefile.in
rename : config/mkdepend/cppsetup.c => js/src/config/mkdepend/cppsetup.c
rename : config/mkdepend/def.h => js/src/config/mkdepend/def.h
rename : config/mkdepend/ifparser.c => js/src/config/mkdepend/ifparser.c
rename : config/mkdepend/ifparser.h => js/src/config/mkdepend/ifparser.h
rename : config/mkdepend/imakemdep.h => js/src/config/mkdepend/imakemdep.h
rename : config/mkdepend/include.c => js/src/config/mkdepend/include.c
rename : config/mkdepend/main.c => js/src/config/mkdepend/main.c
rename : config/mkdepend/mkdepend.man => js/src/config/mkdepend/mkdepend.man
rename : config/mkdepend/parse.c => js/src/config/mkdepend/parse.c
rename : config/mkdepend/pr.c => js/src/config/mkdepend/pr.c
rename : config/nfspwd.pl => js/src/config/nfspwd.pl
rename : config/nsinstall.c => js/src/config/nsinstall.c
rename : config/nsinstall.py => js/src/config/nsinstall.py
rename : config/pathsub.c => js/src/config/pathsub.c
rename : config/pathsub.h => js/src/config/pathsub.h
rename : config/preprocessor.pl => js/src/config/preprocessor.pl
rename : config/revdepth-nt.pl => js/src/config/revdepth-nt.pl
rename : config/revdepth.pl => js/src/config/revdepth.pl
rename : config/rules.mk => js/src/config/rules.mk
rename : config/system-headers => js/src/config/system-headers
rename : config/version.mk => js/src/config/version.mk
rename : config/version_win.pl => js/src/config/version_win.pl
rename : configure.in => js/src/configure.in
2008-10-29 18:29:22 +03:00
|
|
|
include $(topsrcdir)/config/js/build.mk
|
2006-08-29 20:53:40 +04:00
|
|
|
|
2009-11-12 22:37:34 +03:00
|
|
|
TIERS += platform
|
|
|
|
|
|
|
|
ifdef NS_TRACE_MALLOC
|
|
|
|
tier_platform_dirs = tools/trace-malloc/lib
|
|
|
|
endif
|
|
|
|
|
2010-03-04 01:04:32 +03:00
|
|
|
ifdef MOZ_TREE_FREETYPE
|
2010-11-03 15:50:53 +03:00
|
|
|
tier_platform_staticdirs += modules/freetype2
|
2010-03-04 01:04:32 +03:00
|
|
|
endif
|
|
|
|
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += xpcom
|
|
|
|
|
|
|
|
ifndef MOZ_NATIVE_ZLIB
|
|
|
|
tier_platform_dirs += modules/zlib
|
|
|
|
endif
|
|
|
|
|
|
|
|
tier_platform_dirs += \
|
|
|
|
modules/libpref \
|
|
|
|
intl \
|
|
|
|
netwerk \
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
ifdef MOZ_AUTH_EXTENSION
|
|
|
|
tier_platform_dirs += extensions/auth
|
|
|
|
endif
|
2006-08-29 20:53:40 +04:00
|
|
|
|
|
|
|
#
|
2009-11-12 22:37:34 +03:00
|
|
|
# "external" - 3rd party individual libraries
|
2006-08-29 20:53:40 +04:00
|
|
|
#
|
|
|
|
|
|
|
|
ifndef MOZ_NATIVE_JPEG
|
2011-10-18 08:25:53 +04:00
|
|
|
tier_platform_dirs += media/libjpeg
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef MOZ_UPDATER
|
2008-03-12 14:13:09 +03:00
|
|
|
ifndef MOZ_NATIVE_BZ2
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += modules/libbz2
|
2008-03-12 14:13:09 +03:00
|
|
|
endif
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += modules/libmar
|
|
|
|
tier_platform_dirs += other-licenses/bsdiff
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += gfx/qcms
|
2007-07-24 02:02:17 +04:00
|
|
|
|
2006-08-29 20:53:40 +04:00
|
|
|
#
|
2009-11-12 22:37:34 +03:00
|
|
|
# "gecko" - core components
|
2006-08-29 20:53:40 +04:00
|
|
|
#
|
|
|
|
|
2011-12-24 12:25:52 +04:00
|
|
|
tier_platform_dirs += ipc js/ipc
|
2009-08-28 03:05:38 +04:00
|
|
|
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += \
|
2011-10-06 02:15:45 +04:00
|
|
|
hal \
|
2011-10-14 21:52:47 +04:00
|
|
|
js/xpconnect \
|
2006-09-14 02:13:40 +04:00
|
|
|
intl/chardet \
|
2006-08-29 20:53:40 +04:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
ifdef MOZ_ENABLE_GTK2
|
2008-08-07 00:48:55 +04:00
|
|
|
ifdef MOZ_X11
|
2012-01-04 07:09:29 +04:00
|
|
|
tier_platform_dirs += widget/gtkxtbin
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
2008-08-07 00:48:55 +04:00
|
|
|
endif
|
2006-08-29 20:53:40 +04:00
|
|
|
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += \
|
2006-08-29 20:53:40 +04:00
|
|
|
modules/libjar \
|
2011-08-06 21:05:49 +04:00
|
|
|
storage \
|
2006-08-29 20:53:40 +04:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
ifdef MOZ_PERMISSIONS
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += \
|
2006-08-29 20:53:40 +04:00
|
|
|
extensions/cookie \
|
|
|
|
extensions/permissions \
|
|
|
|
$(NULL)
|
|
|
|
endif
|
|
|
|
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += rdf
|
2006-08-29 20:53:40 +04:00
|
|
|
|
|
|
|
ifdef MOZ_JSDEBUGGER
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += js/jsd
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
2010-06-09 03:31:27 +04:00
|
|
|
ifdef MOZ_VORBIS
|
|
|
|
tier_platform_dirs += \
|
|
|
|
media/libvorbis \
|
|
|
|
$(NULL)
|
|
|
|
endif
|
|
|
|
|
2010-10-19 06:56:01 +04:00
|
|
|
ifdef MOZ_TREMOR
|
|
|
|
tier_platform_dirs += \
|
|
|
|
media/libtremor \
|
|
|
|
$(NULL)
|
|
|
|
endif
|
|
|
|
|
2010-06-09 03:31:27 +04:00
|
|
|
ifdef MOZ_WEBM
|
2010-11-05 20:24:28 +03:00
|
|
|
tier_platform_dirs += media/libnestegg
|
|
|
|
ifndef MOZ_NATIVE_LIBVPX
|
|
|
|
tier_platform_dirs += media/libvpx
|
|
|
|
endif
|
2010-06-09 03:31:27 +04:00
|
|
|
endif
|
|
|
|
|
2008-07-30 10:50:14 +04:00
|
|
|
ifdef MOZ_OGG
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += \
|
2008-08-06 04:47:37 +04:00
|
|
|
media/libogg \
|
|
|
|
media/libtheora \
|
2008-07-30 10:50:14 +04:00
|
|
|
$(NULL)
|
|
|
|
endif
|
|
|
|
|
2008-11-06 23:53:20 +03:00
|
|
|
ifdef MOZ_SYDNEYAUDIO
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += \
|
2008-11-06 23:53:20 +03:00
|
|
|
media/libsydneyaudio \
|
|
|
|
$(NULL)
|
|
|
|
endif
|
|
|
|
|
2012-01-13 05:38:39 +04:00
|
|
|
ifdef MOZ_CUBEB
|
|
|
|
tier_platform_dirs += \
|
|
|
|
media/libcubeb \
|
|
|
|
$(NULL)
|
|
|
|
endif
|
|
|
|
|
2011-09-03 04:55:30 +04:00
|
|
|
ifndef MOZ_NATIVE_PNG
|
2011-10-18 08:25:53 +04:00
|
|
|
tier_platform_dirs += media/libpng
|
2011-09-03 04:55:30 +04:00
|
|
|
endif
|
|
|
|
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += \
|
2006-08-29 20:53:40 +04:00
|
|
|
uriloader \
|
|
|
|
caps \
|
2009-06-29 02:44:22 +04:00
|
|
|
parser \
|
2006-08-29 20:53:40 +04:00
|
|
|
gfx \
|
2011-10-18 08:32:45 +04:00
|
|
|
image \
|
2006-08-29 20:53:40 +04:00
|
|
|
dom \
|
|
|
|
view \
|
|
|
|
widget \
|
|
|
|
content \
|
2007-02-24 23:07:06 +03:00
|
|
|
editor \
|
2006-08-29 20:53:40 +04:00
|
|
|
layout \
|
|
|
|
docshell \
|
|
|
|
embedding \
|
|
|
|
xpfe/appshell \
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
ifdef MOZ_UNIVERSALCHARDET
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += extensions/universalchardet
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef ACCESSIBILITY
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += accessible
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
|
|
|
#
|
2009-11-12 22:37:34 +03:00
|
|
|
# "toolkit" - xpfe & toolkit
|
2006-08-29 20:53:40 +04:00
|
|
|
#
|
|
|
|
|
2010-06-12 00:13:26 +04:00
|
|
|
tier_platform_dirs += profile
|
2006-08-29 20:53:40 +04:00
|
|
|
|
|
|
|
# This must preceed xpfe
|
|
|
|
ifdef MOZ_JPROF
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += tools/jprof
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
2011-08-27 04:05:37 +04:00
|
|
|
tier_platform_dirs += tools/profiler
|
|
|
|
|
2010-03-23 23:33:51 +03:00
|
|
|
tier_platform_dirs += xpfe/components
|
2006-08-29 20:53:40 +04:00
|
|
|
|
|
|
|
ifdef MOZ_ENABLE_XREMOTE
|
2012-01-04 07:09:29 +04:00
|
|
|
tier_platform_dirs += widget/xremoteclient
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef MOZ_SPELLCHECK
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += extensions/spellcheck
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += toolkit
|
2006-08-29 20:53:40 +04:00
|
|
|
|
|
|
|
ifdef MOZ_PSM
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += security/manager
|
2006-08-29 20:53:40 +04:00
|
|
|
else
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += security/manager/boot/public security/manager/ssl/public
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef MOZ_PREF_EXTENSIONS
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += extensions/pref
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
2010-12-20 12:12:12 +03:00
|
|
|
tier_platform_dirs += services/crypto/component
|
2010-12-10 05:27:48 +03:00
|
|
|
|
2010-08-12 23:37:44 +04:00
|
|
|
tier_platform_dirs += startupcache
|
|
|
|
|
2011-10-06 20:15:07 +04:00
|
|
|
tier_platform_dirs += js/ductwork/debugger
|
2011-08-31 19:39:39 +04:00
|
|
|
|
2011-12-08 03:24:20 +04:00
|
|
|
tier_platform_dirs += other-licenses/snappy
|
|
|
|
|
2010-09-22 05:10:06 +04:00
|
|
|
ifdef APP_LIBXUL_STATICDIRS
|
|
|
|
# Applications can cheat and ask for code to be
|
|
|
|
# built before libxul so libxul can be linked against it.
|
|
|
|
tier_platform_staticdirs += $(APP_LIBXUL_STATICDIRS)
|
|
|
|
endif
|
|
|
|
ifdef APP_LIBXUL_DIRS
|
|
|
|
# Applications can cheat and ask for code to be
|
|
|
|
# built before libxul so it can be linked into libxul.
|
|
|
|
tier_platform_dirs += $(APP_LIBXUL_DIRS)
|
|
|
|
endif
|
|
|
|
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += toolkit/library
|
2006-08-29 20:53:40 +04:00
|
|
|
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += xpcom/stub
|
2006-08-29 20:53:40 +04:00
|
|
|
|
|
|
|
ifdef NS_TRACE_MALLOC
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += tools/trace-malloc
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
2006-09-28 00:17:56 +04:00
|
|
|
ifdef MOZ_ENABLE_GNOME_COMPONENT
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += toolkit/system/gnome
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
2009-11-18 18:20:45 +03:00
|
|
|
ifndef MOZ_ENABLE_LIBCONIC
|
|
|
|
# if libconic is present, it will do its own network monitoring
|
2006-12-04 23:42:31 +03:00
|
|
|
ifdef MOZ_ENABLE_DBUS
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += toolkit/system/dbus
|
2006-12-04 23:42:31 +03:00
|
|
|
endif
|
2009-11-18 18:20:45 +03:00
|
|
|
endif
|
2006-12-04 23:42:31 +03:00
|
|
|
|
2006-08-29 20:53:40 +04:00
|
|
|
ifdef MOZ_LEAKY
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += tools/leaky
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef MOZ_MAPINFO
|
2009-11-12 22:37:34 +03:00
|
|
|
tier_platform_dirs += tools/codesighs
|
2006-08-29 20:53:40 +04:00
|
|
|
endif
|
2007-01-17 23:38:57 +03:00
|
|
|
|
2008-09-09 21:59:11 +04:00
|
|
|
ifdef ENABLE_TESTS
|
2010-06-02 00:45:01 +04:00
|
|
|
tier_platform_dirs += testing/mochitest
|
2011-10-14 03:27:33 +04:00
|
|
|
tier_platform_dirs += testing/xpcshell
|
2010-08-23 04:11:43 +04:00
|
|
|
tier_platform_dirs += testing/tools/screenshot
|
2011-11-16 20:58:30 +04:00
|
|
|
tier_platform_dirs += testing/peptest
|
2011-11-29 20:43:16 +04:00
|
|
|
tier_platform_dirs += testing/mozbase
|
2007-01-17 23:38:57 +03:00
|
|
|
endif
|