2007-03-22 10:30:00 -07:00
|
|
|
# -*- Mode: makefile -*-
|
|
|
|
#
|
|
|
|
# ***** 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 Mozilla Communicator client code, released
|
|
|
|
# March 31, 1998.
|
|
|
|
#
|
|
|
|
# The Initial Developer of the Original Code is
|
|
|
|
# Netscape Communications Corporation.
|
|
|
|
# Portions created by the Initial Developer are Copyright (C) 1998
|
|
|
|
# the Initial Developer. All Rights Reserved.
|
|
|
|
#
|
|
|
|
# Contributor(s):
|
|
|
|
#
|
|
|
|
# Alternatively, the contents of this file may be used under the terms of
|
|
|
|
# either of 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 *****
|
|
|
|
|
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 08:29:22 -07:00
|
|
|
DEPTH = .
|
2007-03-22 10:30:00 -07:00
|
|
|
topsrcdir = @top_srcdir@
|
|
|
|
srcdir = @srcdir@
|
|
|
|
|
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 08:29:22 -07:00
|
|
|
DIRS = config
|
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
include $(DEPTH)/config/autoconf.mk
|
|
|
|
|
|
|
|
MODULE = js
|
|
|
|
LIBRARY_NAME = mozjs
|
|
|
|
GRE_MODULE = 1
|
|
|
|
|
2008-10-28 12:33:55 -07:00
|
|
|
PROGRAM = js$(BIN_SUFFIX)
|
|
|
|
# The shell uses some 'HIDDEN' symbols to produce statistics, so we
|
|
|
|
# link directly against the .o files, not against the JS shared
|
|
|
|
# library.
|
|
|
|
PROGOBJS = js.$(OBJ_SUFFIX) $(OBJS)
|
|
|
|
LIBS = $(NSPR_LIBS)
|
|
|
|
|
2008-11-14 14:15:02 -08:00
|
|
|
ifdef GNU_CXX
|
|
|
|
ifdef INTEL_CXX
|
2008-03-18 12:36:57 -07:00
|
|
|
# icc gets special optimize flags
|
|
|
|
ifdef MOZ_PROFILE_GENERATE
|
|
|
|
MODULE_OPTIMIZE_FLAGS = -O0
|
|
|
|
else
|
|
|
|
MODULE_OPTIMIZE_FLAGS = -O2 -ip
|
|
|
|
#XXX: do we want different INTERP_OPTIMIZER flags here?
|
|
|
|
endif
|
2008-11-14 14:15:02 -08:00
|
|
|
else # not INTEL_CXX
|
2008-03-15 19:48:58 -07:00
|
|
|
MODULE_OPTIMIZE_FLAGS = -Os -fstrict-aliasing $(MOZ_OPTIMIZE_SIZE_TWEAK)
|
2008-03-13 11:06:16 -07:00
|
|
|
# Special optimization flags for jsinterp.c
|
|
|
|
INTERP_OPTIMIZER = -O3 -fstrict-aliasing
|
2008-03-18 12:36:57 -07:00
|
|
|
endif
|
2008-11-14 14:15:02 -08:00
|
|
|
else # not GNU_CXX
|
2007-12-13 19:22:52 -08:00
|
|
|
ifeq ($(OS_ARCH),SunOS)
|
2008-04-01 01:16:17 -07:00
|
|
|
MODULE_OPTIMIZE_FLAGS = -xO4
|
2007-12-13 19:22:52 -08:00
|
|
|
endif
|
|
|
|
ifeq ($(OS_ARCH),WINNT)
|
2008-10-30 14:41:21 -07:00
|
|
|
ifdef WINCE
|
|
|
|
# -GL is not supported on windows mobile while we are using the arm-wince-link command
|
|
|
|
MODULE_OPTIMIZE_FLAGS = -O2
|
|
|
|
else
|
2008-01-13 20:45:42 -08:00
|
|
|
MODULE_OPTIMIZE_FLAGS = -O2 -GL
|
2007-12-13 19:22:52 -08:00
|
|
|
endif
|
|
|
|
endif
|
2008-10-30 14:41:21 -07:00
|
|
|
endif
|
|
|
|
|
2007-12-13 19:22:52 -08:00
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
|
|
|
LIBRARY_NAME = js$(MOZ_BITS)$(VERSION_NUMBER)
|
|
|
|
RESFILE = js$(MOZ_BITS)40.res
|
|
|
|
endif
|
|
|
|
|
|
|
|
# JavaScript must be built shared, even for static builds, as it is used by
|
|
|
|
# other modules which are always built shared. Failure to do so results in
|
|
|
|
# the js code getting copied into xpinstall and jsd as well as mozilla-bin,
|
|
|
|
# and then the static data cells used for locking no longer work.
|
|
|
|
|
|
|
|
ifndef JS_STATIC_BUILD
|
|
|
|
FORCE_SHARED_LIB = 1
|
|
|
|
endif
|
|
|
|
|
2008-07-10 20:05:27 -07:00
|
|
|
ifeq (86,$(findstring 86,$(OS_TEST)))
|
2008-08-21 18:07:26 -07:00
|
|
|
ifeq (64,$(findstring 64,$(OS_TEST)))
|
|
|
|
else
|
2008-07-10 20:05:27 -07:00
|
|
|
DEFINES += -DAVMPLUS_IA32
|
|
|
|
NANOJIT_ARCH = i386
|
|
|
|
ENABLE_JIT = 1
|
|
|
|
endif
|
2008-08-21 18:07:26 -07:00
|
|
|
endif
|
2008-07-10 20:05:27 -07:00
|
|
|
|
2008-09-06 01:19:29 -07:00
|
|
|
ifeq (arm,$(findstring arm,$(OS_TEST)))
|
|
|
|
DEFINES += -DAVMPLUS_ARM
|
|
|
|
NANOJIT_ARCH = ARM
|
|
|
|
ENABLE_JIT = 1
|
|
|
|
endif
|
|
|
|
|
2008-09-05 15:15:00 -07:00
|
|
|
ifneq (,$(filter Linux Darwin SunOS FreeBSD,$(OS_ARCH)))
|
|
|
|
DEFINES += -DAVMPLUS_UNIX
|
|
|
|
endif
|
|
|
|
|
2008-07-10 20:05:27 -07:00
|
|
|
ifeq ($(OS_ARCH),Linux)
|
2008-09-05 15:15:00 -07:00
|
|
|
DEFINES += -DAVMPLUS_LINUX
|
2008-07-10 20:05:27 -07:00
|
|
|
endif
|
|
|
|
|
2008-07-11 08:02:14 -07:00
|
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
|
|
DEFINES += -DAVMPLUS_WIN32
|
|
|
|
endif
|
|
|
|
|
2008-08-25 15:51:30 -07:00
|
|
|
VPATH = $(srcdir)
|
|
|
|
|
2007-07-16 11:40:49 -07:00
|
|
|
CPPSRCS = \
|
|
|
|
jsapi.cpp \
|
|
|
|
jsarena.cpp \
|
|
|
|
jsarray.cpp \
|
|
|
|
jsatom.cpp \
|
|
|
|
jsbool.cpp \
|
|
|
|
jscntxt.cpp \
|
|
|
|
jsdate.cpp \
|
|
|
|
jsdbgapi.cpp \
|
|
|
|
jsdhash.cpp \
|
|
|
|
jsdtoa.cpp \
|
|
|
|
jsemit.cpp \
|
|
|
|
jsexn.cpp \
|
|
|
|
jsfun.cpp \
|
|
|
|
jsgc.cpp \
|
|
|
|
jshash.cpp \
|
|
|
|
jsinterp.cpp \
|
2008-03-05 13:00:01 -08:00
|
|
|
jsinvoke.cpp \
|
2007-07-16 11:40:49 -07:00
|
|
|
jsiter.cpp \
|
|
|
|
jslock.cpp \
|
|
|
|
jslog2.cpp \
|
|
|
|
jslong.cpp \
|
|
|
|
jsmath.cpp \
|
|
|
|
jsnum.cpp \
|
|
|
|
jsobj.cpp \
|
2008-09-30 23:13:58 -07:00
|
|
|
json.cpp \
|
2007-07-16 11:40:49 -07:00
|
|
|
jsopcode.cpp \
|
|
|
|
jsparse.cpp \
|
|
|
|
jsprf.cpp \
|
|
|
|
jsregexp.cpp \
|
|
|
|
jsscan.cpp \
|
|
|
|
jsscope.cpp \
|
|
|
|
jsscript.cpp \
|
|
|
|
jsstr.cpp \
|
|
|
|
jsutil.cpp \
|
|
|
|
jsxdrapi.cpp \
|
|
|
|
jsxml.cpp \
|
|
|
|
prmjtime.cpp \
|
2007-03-22 10:30:00 -07:00
|
|
|
$(NULL)
|
|
|
|
|
2007-10-19 15:24:32 -07:00
|
|
|
ifdef HAVE_DTRACE
|
|
|
|
CSRCS += \
|
|
|
|
jsdtracef.c
|
|
|
|
endif
|
|
|
|
|
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 08:29:22 -07:00
|
|
|
INSTALLED_HEADERS = \
|
2008-10-29 08:29:37 -07:00
|
|
|
js-config.h \
|
2007-03-22 10:30:00 -07:00
|
|
|
jsautocfg.h \
|
|
|
|
jsautokw.h \
|
|
|
|
js.msg \
|
|
|
|
jsapi.h \
|
|
|
|
jsarray.h \
|
|
|
|
jsarena.h \
|
|
|
|
jsatom.h \
|
|
|
|
jsbit.h \
|
|
|
|
jsbool.h \
|
|
|
|
jsclist.h \
|
|
|
|
jscntxt.h \
|
|
|
|
jscompat.h \
|
|
|
|
jsdate.h \
|
|
|
|
jsdbgapi.h \
|
|
|
|
jsdhash.h \
|
2007-12-27 13:34:03 -08:00
|
|
|
jsdtoa.h \
|
2007-03-22 10:30:00 -07:00
|
|
|
jsemit.h \
|
|
|
|
jsfun.h \
|
|
|
|
jsgc.h \
|
|
|
|
jshash.h \
|
|
|
|
jsinterp.h \
|
|
|
|
jsiter.h \
|
|
|
|
jslock.h \
|
|
|
|
jslong.h \
|
|
|
|
jsmath.h \
|
|
|
|
jsnum.h \
|
|
|
|
jsobj.h \
|
2008-09-30 23:13:58 -07:00
|
|
|
json.h \
|
2007-03-22 10:30:00 -07:00
|
|
|
jsopcode.tbl \
|
|
|
|
jsopcode.h \
|
|
|
|
jsotypes.h \
|
|
|
|
jsparse.h \
|
|
|
|
jsprf.h \
|
|
|
|
jsproto.tbl \
|
|
|
|
jsprvtd.h \
|
|
|
|
jspubtd.h \
|
|
|
|
jsregexp.h \
|
|
|
|
jsscan.h \
|
|
|
|
jsscope.h \
|
|
|
|
jsscript.h \
|
|
|
|
jsstddef.h \
|
|
|
|
jsstr.h \
|
2008-06-06 15:12:48 -07:00
|
|
|
jstracer.h \
|
2007-03-22 10:30:00 -07:00
|
|
|
jstypes.h \
|
|
|
|
jsutil.h \
|
2008-09-05 10:19:17 -07:00
|
|
|
jsversion.h \
|
2007-03-22 10:30:00 -07:00
|
|
|
jsxdrapi.h \
|
|
|
|
jsxml.h \
|
2008-07-10 20:05:27 -07:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
ifdef ENABLE_JIT
|
2008-08-25 15:51:30 -07:00
|
|
|
VPATH += $(srcdir)/nanojit
|
|
|
|
|
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 08:29:22 -07:00
|
|
|
INSTALLED_HEADERS += \
|
2008-10-08 15:08:33 -07:00
|
|
|
builtins.tbl \
|
|
|
|
jsbuiltins.h \
|
2008-08-25 15:51:30 -07:00
|
|
|
Assembler.h \
|
|
|
|
LIR.h \
|
|
|
|
avmplus.h \
|
|
|
|
Fragmento.h \
|
|
|
|
Native.h \
|
|
|
|
Native$(NANOJIT_ARCH).h \
|
|
|
|
RegAlloc.h \
|
|
|
|
nanojit.h \
|
2008-10-08 15:08:33 -07:00
|
|
|
TraceTreeDrawer.h \
|
2007-03-22 10:30:00 -07:00
|
|
|
$(NULL)
|
|
|
|
|
2008-07-10 20:05:27 -07:00
|
|
|
CPPSRCS += \
|
|
|
|
jstracer.cpp \
|
2008-08-25 15:51:30 -07:00
|
|
|
Assembler.cpp \
|
|
|
|
Fragmento.cpp \
|
|
|
|
LIR.cpp \
|
|
|
|
RegAlloc.cpp \
|
|
|
|
avmplus.cpp \
|
|
|
|
Native$(NANOJIT_ARCH).cpp \
|
2008-07-10 20:05:27 -07:00
|
|
|
jsbuiltins.cpp \
|
|
|
|
$(NULL)
|
|
|
|
|
2008-07-10 06:12:53 -07:00
|
|
|
ifdef DEBUG
|
2008-08-25 15:51:30 -07:00
|
|
|
CPPSRCS += TraceTreeDrawer.cpp
|
2008-07-10 06:12:53 -07:00
|
|
|
endif
|
|
|
|
|
2008-07-10 20:05:27 -07:00
|
|
|
DEFINES += -DFEATURE_NANOJIT -DJS_TRACER
|
2008-07-10 06:12:53 -07:00
|
|
|
endif
|
|
|
|
|
2007-10-19 15:24:32 -07:00
|
|
|
ifdef HAVE_DTRACE
|
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 08:29:22 -07:00
|
|
|
INSTALLED_HEADERS += \
|
2007-10-19 15:24:32 -07:00
|
|
|
jsdtracef.h \
|
2008-11-13 05:51:37 -08:00
|
|
|
$(CURDIR)/javascript-trace.h \
|
2007-10-19 15:24:32 -07:00
|
|
|
$(NULL)
|
|
|
|
endif
|
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
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 08:29:22 -07:00
|
|
|
INSTALLED_HEADERS += jscpucfg.h
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
|
|
|
|
JS_SAFE_ARENA = 1
|
|
|
|
|
|
|
|
DASH_R = -r
|
|
|
|
|
2007-09-05 08:56:56 -07:00
|
|
|
ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
|
|
|
|
SDK_LIBRARY = $(IMPORT_LIBRARY)
|
|
|
|
else
|
|
|
|
SDK_LIBRARY = $(SHARED_LIBRARY)
|
|
|
|
endif
|
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
include $(topsrcdir)/config/config.mk
|
|
|
|
|
|
|
|
EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
|
|
|
|
|
2008-05-28 11:42:31 -07:00
|
|
|
ifdef MOZ_MEMORY
|
|
|
|
ifeq ($(OS_ARCH),SunOS)
|
|
|
|
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib)
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2007-07-16 11:40:49 -07:00
|
|
|
# When using gcc the assembly is inlined in the C-file (see jslock.cpp)
|
2007-03-22 10:30:00 -07:00
|
|
|
ifeq ($(OS_ARCH),SunOS)
|
2007-07-17 14:23:24 -07:00
|
|
|
ifneq (86,$(findstring 86,$(OS_TEST)))
|
2007-03-22 10:30:00 -07:00
|
|
|
ifndef GNU_CC
|
|
|
|
ASFILES = lock_$(OS_ARCH).s
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef BUILD_OPT
|
|
|
|
MOCHAFILE = 1
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef NSBUILDROOT
|
|
|
|
JSJAVA_STUBHEADERS = \
|
|
|
|
-I$(topsrcdir)/sun-java/include/_gen \
|
|
|
|
-I$(topsrcdir)/sun-java/netscape/javascript/_jri \
|
|
|
|
-I$(topsrcdir)/sun-java/netscape/security/_jri
|
|
|
|
else
|
|
|
|
JSJAVA_STUBHEADERS = -I$(JRI_GEN_DIR) -I$(JDK_GEN_DIR)
|
|
|
|
endif
|
|
|
|
|
|
|
|
JSJAVA_CFLAGS = \
|
|
|
|
-I$(topsrcdir)/sun-java/md-include \
|
|
|
|
-I$(topsrcdir)/sun-java/include \
|
|
|
|
$(JSJAVA_STUBHEADERS)
|
|
|
|
|
|
|
|
# Define keyword generator before rules.mk, see bug 323979 comment 50
|
|
|
|
|
|
|
|
HOST_SIMPLE_PROGRAMS += host_jskwgen$(HOST_BIN_SUFFIX)
|
|
|
|
GARBAGE += jsautokw.h host_jskwgen$(HOST_BIN_SUFFIX)
|
2008-06-20 02:55:49 -07:00
|
|
|
|
|
|
|
HOST_SIMPLE_PROGRAMS += host_jsoplengen$(HOST_BIN_SUFFIX)
|
|
|
|
GARBAGE += jsautooplen.h host_jsoplengen$(HOST_BIN_SUFFIX)
|
|
|
|
|
2007-07-16 11:40:49 -07:00
|
|
|
USE_HOST_CXX = 1
|
2007-03-22 10:30:00 -07:00
|
|
|
|
2007-10-19 15:24:32 -07:00
|
|
|
ifdef HAVE_DTRACE
|
2007-11-01 23:36:49 -07:00
|
|
|
ifneq ($(OS_ARCH),Darwin)
|
2007-10-19 15:24:32 -07:00
|
|
|
DTRACE_PROBE_OBJ = $(LIBRARY_NAME)-dtrace.$(OBJ_SUFFIX)
|
2007-11-01 23:36:49 -07:00
|
|
|
endif
|
2007-10-19 15:24:32 -07:00
|
|
|
MOZILLA_DTRACE_SRC = $(srcdir)/javascript-trace.d
|
|
|
|
endif
|
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
|
2008-10-29 08:40:39 -07:00
|
|
|
ifdef MOZ_SYNC_BUILD_FILES
|
|
|
|
# Because the SpiderMonkey can be distributed and built independently
|
|
|
|
# of the Mozilla source tree, it contains its own copies of many of
|
|
|
|
# the files used by the top-level Mozilla build process, from the
|
|
|
|
# 'config' and 'build' subtrees.
|
|
|
|
#
|
|
|
|
# To make it simpler to keep the copies in sync, we follow the policy
|
|
|
|
# that the SpiderMonkey copies must always be exact copies of those in
|
|
|
|
# the containing Mozilla tree. If you've made a change in one, it
|
|
|
|
# belongs in the other as well. If the change isn't right for both
|
|
|
|
# places, then that's something to bring up with the other developers.
|
|
|
|
#
|
|
|
|
# Some files are reasonable to diverge; for example,
|
|
|
|
# js/config/autoconf.mk.in doesn't need most of the stuff in
|
|
|
|
# config/autoconf.mk.in.
|
|
|
|
check-sync-dirs = $(PYTHON) $(srcdir)/config/check-sync-dirs.py
|
|
|
|
check::
|
|
|
|
$(check-sync-dirs) $(srcdir)/config $(MOZ_SYNC_BUILD_FILES)/config
|
|
|
|
$(check-sync-dirs) $(srcdir)/build $(MOZ_SYNC_BUILD_FILES)/build
|
|
|
|
endif
|
|
|
|
|
2008-07-10 06:12:53 -07:00
|
|
|
# our build system doesn't handle subdir srcs very gracefully today
|
|
|
|
export::
|
|
|
|
mkdir -p nanojit
|
2007-03-22 10:30:00 -07:00
|
|
|
|
2008-07-10 06:12:53 -07:00
|
|
|
DEFINES += -DEXPORT_JS_API
|
2008-07-10 04:56:36 -07:00
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
INCLUDES += -I$(srcdir)
|
|
|
|
|
|
|
|
# MSVC '-Gy' cc flag and '/OPT:REF' linker flag cause JS_GetArgument and
|
|
|
|
# JS_GetLocalVariable to be folded to the same address by the linker,
|
|
|
|
# leading to a crash on startup. See bug 151066. So, in optimized builds,
|
|
|
|
# add the /OPT:NOICF flag, which turns off 'identical COMDAT folding'.
|
|
|
|
#
|
|
|
|
# N.B.: 'identical COMDAT folding' that folds functions whose addresses
|
|
|
|
# are taken violates the ISO C and C++ standards.
|
|
|
|
ifndef MOZ_DEBUG
|
|
|
|
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
|
|
|
|
LDFLAGS += -OPT:NOICF
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
GARBAGE += jscpucfg.o jsautocfg.h jsautocfg.tmp jscpucfg
|
|
|
|
|
|
|
|
ifneq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
|
|
|
|
TARGETS += jscpucfg$(HOST_BIN_SUFFIX)
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef JS_SAFE_ARENA
|
|
|
|
DEFINES += -DJS_USE_SAFE_ARENA
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef JS_THREADSAFE
|
|
|
|
DEFINES += -DJS_THREADSAFE
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef JS_NO_THIN_LOCKS
|
|
|
|
DEFINES += -DJS_USE_ONLY_NSPR_LOCKS
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef JS_VERSION
|
|
|
|
DEFINES += -DJS_VERSION=$(JS_VERSION)
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifneq ($(findstring -L,$(NSPR_LIBS)),)
|
|
|
|
NSPR_STATIC_PATH = $(subst -L,,$(findstring -L,$(NSPR_LIBS)))
|
|
|
|
else
|
|
|
|
NSPR_STATIC_PATH = $(DIST)/lib
|
|
|
|
endif
|
|
|
|
|
2008-01-16 12:42:50 -08:00
|
|
|
ifdef MOZ_SHARK
|
|
|
|
CFLAGS += -F/System/Library/PrivateFrameworks
|
2008-06-06 13:04:12 -07:00
|
|
|
CXXFLAGS += -F/System/Library/PrivateFrameworks
|
2008-01-16 12:42:50 -08:00
|
|
|
LDFLAGS += -F/System/Library/PrivateFrameworks -framework CHUD
|
|
|
|
endif
|
|
|
|
|
2008-07-29 15:19:26 -07:00
|
|
|
ifdef MOZ_VTUNE
|
|
|
|
CXXFLAGS += -IC:/Program\ Files/Intel/VTune/Analyzer/Include
|
|
|
|
EXTRA_DSO_LDOPTS += C:/Program\ Files/Intel/VTune/Analyzer/Lib/VtuneApi.lib
|
|
|
|
LIBS += C:/Program\ Files/Intel/VTune/Analyzer/Lib/VtuneApi.lib
|
|
|
|
endif
|
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
# BeOS and HP-UX do not require the extra linking of "-lm"
|
|
|
|
ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH)))
|
2008-08-26 14:34:36 -07:00
|
|
|
EXTRA_LIBS += -lm
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
|
|
|
|
# Prevent floating point errors caused by VC++ optimizations
|
|
|
|
ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
|
|
|
|
ifeq (,$(filter-out 1200 1300 1310,$(_MSC_VER)))
|
|
|
|
CFLAGS += -Op
|
|
|
|
else
|
|
|
|
CFLAGS += -fp:precise
|
|
|
|
endif
|
|
|
|
endif # WINNT
|
|
|
|
|
|
|
|
ifeq ($(OS_ARCH),FreeBSD)
|
2008-08-26 14:34:36 -07:00
|
|
|
EXTRA_LIBS += -pthread
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
ifeq ($(OS_ARCH),IRIX)
|
|
|
|
ifdef USE_N32
|
|
|
|
DASH_R += -n32
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
ifeq ($(OS_ARCH),Linux)
|
2008-08-26 14:34:36 -07:00
|
|
|
EXTRA_LIBS += -ldl
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
ifeq ($(OS_ARCH),OSF1)
|
2008-08-26 14:34:36 -07:00
|
|
|
EXTRA_LIBS += -lc_r
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
ifeq ($(OS_ARCH),SunOS)
|
|
|
|
ifeq ($(TARGET_CPU),sparc)
|
|
|
|
|
|
|
|
ifdef JS_ULTRASPARC_OPTS
|
|
|
|
DEFINES += -DULTRA_SPARC
|
|
|
|
ifdef GNU_CC
|
|
|
|
CFLAGS += -Wa,-xarch=v8plus,-DULTRA_SPARC,-P,-L,-D_ASM,-D__STDC__=0
|
|
|
|
CXXFLAGS += -Wa,-xarch=v8plus,-DULTRA_SPARC,-P,-L,-D_ASM,-D__STDC__=0,-K,PIC
|
|
|
|
else
|
|
|
|
ASFLAGS += -xarch=v8plus -DULTRA_SPARC -P -L -D_ASM -D__STDC__=0 -K PIC
|
|
|
|
endif # GNU_CC
|
|
|
|
endif # JS_ULTRASPARC_OPTS
|
|
|
|
|
|
|
|
endif
|
|
|
|
ifeq ($(OS_RELEASE),4.1)
|
2008-08-26 14:34:36 -07:00
|
|
|
EXTRA_LIBS += -ldl -lnsl
|
2007-03-22 10:30:00 -07:00
|
|
|
else
|
2008-08-26 14:34:36 -07:00
|
|
|
EXTRA_LIBS += -lposix4 -ldl -lnsl -lsocket
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2008-06-20 10:34:42 -07:00
|
|
|
ifdef MOZ_MEMORY
|
|
|
|
ifeq ($(OS_ARCH),Darwin)
|
|
|
|
LDFLAGS += -ljemalloc
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2008-09-05 16:56:03 -07:00
|
|
|
# Sun Studio x86 has an optimization bug with LIR.cpp, use -xO2 instead.
|
|
|
|
ifeq ($(OS_ARCH),SunOS)
|
|
|
|
ifeq (86,$(findstring 86,$(OS_TEST)))
|
|
|
|
ifndef GNU_CC
|
|
|
|
LIR.o: LIR.cpp Makefile.in
|
2008-09-11 05:12:55 -07:00
|
|
|
$(REPORT_BUILD)
|
|
|
|
@$(MAKE_DEPS_AUTO_CXX)
|
|
|
|
$(CXX) -o $@ -c $(patsubst -xO%,-xO2,$(COMPILE_CFLAGS)) $<
|
2008-09-05 16:56:03 -07:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2008-09-25 07:58:56 -07:00
|
|
|
# Allow building jsinterp.c with special optimization flags
|
2008-03-13 11:06:16 -07:00
|
|
|
ifdef INTERP_OPTIMIZER
|
|
|
|
jsinterp.$(OBJ_SUFFIX): MODULE_OPTIMIZE_FLAGS=$(INTERP_OPTIMIZER)
|
|
|
|
endif
|
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
ifeq ($(OS_ARCH),IRIX)
|
|
|
|
ifndef GNU_CC
|
|
|
|
_COMPILE_CFLAGS = $(patsubst -O%,-O1,$(COMPILE_CFLAGS))
|
2007-07-16 11:40:49 -07:00
|
|
|
jsapi.o jsxdrapi.o jsarena.o jsarray.o jsatom.o jsemit.o jsfun.o jsinterp.o jsregexp.o jsparse.o jsopcode.o jsscript.o: %.o: %.cpp Makefile.in
|
2007-03-22 10:30:00 -07:00
|
|
|
$(REPORT_BUILD)
|
2007-08-21 11:08:45 -07:00
|
|
|
@$(MAKE_DEPS_AUTO_CXX)
|
2007-07-16 11:40:49 -07:00
|
|
|
$(CXX) -o $@ -c $(_COMPILE_CFLAGS) $<
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
# An AIX Optimization bug causes PR_dtoa() & JS_dtoa to produce wrong result.
|
|
|
|
# This suppresses optimization for this single compilation unit.
|
|
|
|
ifeq ($(OS_ARCH),AIX)
|
2007-07-16 11:40:49 -07:00
|
|
|
jsatom.o: jsatom.cpp Makefile.in
|
2007-03-22 10:30:00 -07:00
|
|
|
$(REPORT_BUILD)
|
2007-08-21 11:08:45 -07:00
|
|
|
@$(MAKE_DEPS_AUTO_CXX)
|
2007-07-16 11:40:49 -07:00
|
|
|
$(CXX) -o $@ -c $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(COMPILE_CFLAGS)) $<
|
|
|
|
jsdtoa.o: jsdtoa.cpp Makefile.in
|
2007-03-22 10:30:00 -07:00
|
|
|
$(REPORT_BUILD)
|
2007-08-21 11:08:45 -07:00
|
|
|
@$(MAKE_DEPS_AUTO_CXX)
|
2007-07-16 11:40:49 -07:00
|
|
|
$(CXX) -o $@ -c $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(COMPILE_CFLAGS)) $<
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
|
2007-07-16 11:40:49 -07:00
|
|
|
jsopcode.h jsopcode.cpp: jsopcode.tbl
|
2007-03-22 10:30:00 -07:00
|
|
|
|
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 08:29:22 -07:00
|
|
|
export:: jsautocfg.h
|
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
|
|
|
|
jsautocfg.h:
|
|
|
|
touch $@
|
|
|
|
else
|
|
|
|
ifeq ($(OS_ARCH),WINCE)
|
|
|
|
jsautocfg.h:
|
|
|
|
touch $@
|
|
|
|
else
|
|
|
|
jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
|
|
|
|
@rm -f $@ jsautocfg.tmp
|
|
|
|
./jscpucfg > jsautocfg.tmp
|
|
|
|
mv jsautocfg.tmp $@
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
# jscpucfg is a strange target
|
|
|
|
# Needs to be built with the host compiler but needs to include
|
|
|
|
# the mdcpucfg for the target so it needs the appropriate target defines
|
|
|
|
ifdef HOST_NSPR_MDCPUCFG
|
2007-07-16 11:40:49 -07:00
|
|
|
HOST_CXX := $(HOST_CXX) -DMDCPUCFG=$(TARGET_NSPR_MDCPUCFG)
|
|
|
|
HOST_CXXFLAGS := $(patsubst -DXP_%,,$(HOST_CXXFLAGS))
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef CROSS_COMPILE
|
|
|
|
# jscpucfg needs to know when it's supposed to produce a config for the target
|
|
|
|
JSCPUCFG_DEFINES = $(ACDEFINES)
|
|
|
|
|
|
|
|
# This is incredibly hacky. Darwin NSPR uses the same MDCPUCFG for multiple
|
|
|
|
# processors, and determines which processor to configure for based on
|
|
|
|
# #ifdef i386. This macro is among the NSPR defines, but is also automatically
|
|
|
|
# defined by the compiler when building for i386. It therefore needs to be
|
|
|
|
# defined here if targeting i386, and explicitly undefined otherwise.
|
|
|
|
ifeq ($(OS_ARCH),Darwin)
|
|
|
|
ifeq ($(TARGET_CPU),powerpc)
|
|
|
|
JSCPUCFG_DEFINES += -Ui386
|
|
|
|
else
|
|
|
|
JSCPUCFG_DEFINES += -Di386=1
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(OS_ARCH),QNX)
|
|
|
|
ifneq ($(OS_TARGET),NTO)
|
|
|
|
# QNX's compiler apparently can't build a binary directly from a source file.
|
2007-07-16 11:40:49 -07:00
|
|
|
jscpucfg.o: jscpucfg.cpp Makefile.in
|
|
|
|
$(HOST_CXX) $(HOST_CXXFLAGS) -c $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) -o $@ $<
|
2007-03-22 10:30:00 -07:00
|
|
|
|
|
|
|
jscpucfg: jscpucfg.o
|
2007-07-16 11:40:49 -07:00
|
|
|
$(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) -o $@ $<
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
else
|
|
|
|
ifeq ($(OS_ARCH),WINCE)
|
|
|
|
jscpucfg$(HOST_BIN_SUFFIX):
|
|
|
|
echo no need to build jscpucfg $<
|
|
|
|
else
|
2007-07-16 11:40:49 -07:00
|
|
|
jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
|
2008-08-19 16:02:44 -07:00
|
|
|
$(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
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 08:29:22 -07:00
|
|
|
# Compute the linker flags that programs linking against SpiderMonkey should
|
|
|
|
# pass to get SpiderMonkey and its dependencies, beyond just the -L and -l
|
|
|
|
# for the SpiderMonkey library itself.
|
|
|
|
# - EXTRA_DSO_LDOPTS includes the NSPR -L and -l flags.
|
|
|
|
# - OS_LIBS includes libraries selected by the configure script.
|
|
|
|
# - EXTRA_LIBS includes libraries selected by this Makefile.
|
|
|
|
JS_CONFIG_LIBS=$(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS)
|
|
|
|
|
|
|
|
# The configure script invokes this rule explicitly at configure time!
|
|
|
|
# It's important that js-config be ready by the time we're done
|
|
|
|
# configuring, because we may be running other configure scripts that
|
|
|
|
# would like to run js-config themselves, before js is built.
|
|
|
|
#
|
|
|
|
# This file and rules.mk go through a certain amount of work to decide
|
|
|
|
# which libraries to build, what to name them, and what flags to pass
|
|
|
|
# when linking them (and thus what flags its own clients must pass).
|
|
|
|
# All this information needs to go into the js-config script. To
|
|
|
|
# avoid trying to re-compute all that in the configure script, we just
|
|
|
|
# have the configure script generate this Makefile, and then invoke
|
|
|
|
# this rule.
|
|
|
|
at=@
|
|
|
|
js-config: js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk $(topsrcdir)/config/rules.mk
|
|
|
|
rm -f js-config.tmp
|
|
|
|
sed < $< > js-config.tmp \
|
|
|
|
-e 's|$(at)prefix$(at)|$(prefix)|' \
|
|
|
|
-e 's|$(at)exec_prefix$(at)|$(exec_prefix)|' \
|
|
|
|
-e 's|$(at)includedir$(at)|$(includedir)|' \
|
|
|
|
-e 's|$(at)libdir$(at)|$(libdir)|' \
|
|
|
|
-e 's|$(at)MOZILLA_VERSION$(at)|$(MOZILLA_VERSION)|' \
|
|
|
|
-e 's|$(at)LIBRARY_NAME$(at)|$(LIBRARY_NAME)|' \
|
|
|
|
-e 's|$(at)NSPR_CFLAGS$(at)|$(NSPR_CFLAGS)|' \
|
|
|
|
-e 's|$(at)JS_CONFIG_LIBS$(at)|$(JS_CONFIG_LIBS)|' \
|
|
|
|
-e 's|$(at)MOZ_JS_LIBS$(at)|$(MOZ_JS_LIBS)|' \
|
|
|
|
&& mv js-config.tmp $@ && chmod +x $@
|
|
|
|
|
|
|
|
SCRIPTS = js-config
|
|
|
|
|
|
|
|
install:: $(INSTALLED_HEADERS)
|
|
|
|
$(SYSINSTALL) $(IFLAGS1) $^ $(includedir)/$(MODULE)
|
|
|
|
|
|
|
|
install:: $(SCRIPTS) $(PROGRAM)
|
|
|
|
$(SYSINSTALL) $(IFLAGS2) $^ $(bindir)
|
|
|
|
|
|
|
|
# The Mozilla top-level makefiles use install-runtime-libs directly to
|
|
|
|
# place an additional copy of the libraries in the 'dist/bin'
|
|
|
|
# directory.
|
|
|
|
install:: install-runtime-libs
|
|
|
|
install-runtime-libs:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
|
|
|
|
ifneq (,$(LIBRARY))
|
|
|
|
$(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(libdir)
|
|
|
|
endif
|
|
|
|
ifneq (,$(SHARED_LIBRARY))
|
|
|
|
$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(libdir)
|
|
|
|
endif
|
|
|
|
ifneq (,$(IMPORT_LIBRARY))
|
|
|
|
$(SYSINSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(libdir)
|
|
|
|
endif
|
|
|
|
|
2008-05-23 23:44:08 -07:00
|
|
|
# Extra dependancies and rules for auto-generated headers
|
2008-09-05 10:19:17 -07:00
|
|
|
host_jskwgen.$(OBJ_SUFFIX): jsversion.h jskeyword.tbl
|
2007-03-22 10:30:00 -07:00
|
|
|
|
2008-11-10 12:55:46 -08:00
|
|
|
# Use CURDIR to avoid finding a jsautokw.h in the source tree (from a
|
|
|
|
# previous build?) via VPATH when we're building in a separate tree.
|
|
|
|
$(CURDIR)/jsautokw.h: host_jskwgen$(HOST_BIN_SUFFIX)
|
2007-03-22 10:30:00 -07:00
|
|
|
./host_jskwgen$(HOST_BIN_SUFFIX) $@
|
2007-10-19 15:24:32 -07:00
|
|
|
|
2008-05-23 23:44:08 -07:00
|
|
|
host_jsoplengen.$(OBJ_SUFFIX): jsopcode.tbl
|
|
|
|
|
2008-11-10 12:55:46 -08:00
|
|
|
# Use CURDIR to avoid finding a jsautooplen.h in the source tree (from
|
|
|
|
# a previous build?) via VPATH when we're building in a separate tree.
|
|
|
|
$(CURDIR)/jsautooplen.h: host_jsoplengen$(HOST_BIN_SUFFIX)
|
2008-05-23 23:44:08 -07:00
|
|
|
./host_jsoplengen$(HOST_BIN_SUFFIX) $@
|
|
|
|
|
|
|
|
# Force auto-header generation before compiling any source that may use them
|
2008-11-10 12:55:46 -08:00
|
|
|
$(CPPSRCS:%.cpp=%.$(OBJ_SUFFIX)): $(CURDIR)/jsautokw.h $(CURDIR)/jsautooplen.h
|
2008-05-23 23:44:08 -07:00
|
|
|
|
2007-10-19 15:24:32 -07:00
|
|
|
ifdef HAVE_DTRACE
|
2008-11-13 05:51:37 -08:00
|
|
|
$(CURDIR)/javascript-trace.h: $(srcdir)/javascript-trace.d
|
2007-10-19 15:24:32 -07:00
|
|
|
dtrace -h -s $(srcdir)/javascript-trace.d -o javascript-trace.h.in
|
|
|
|
sed 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
|
|
|
|
javascript-trace.h.in > javascript-trace.h
|
2008-11-13 05:51:37 -08:00
|
|
|
|
|
|
|
$(CPPSRCS:%.cpp=%.$(OBJ_SUFFIX)): $(CURDIR)/javascript-trace.h
|
2007-10-19 15:24:32 -07:00
|
|
|
endif
|