A directory's 'libs' target should create symlinks in the top-level
dist/bin and dist/lib directories to the libraries (and any other
generated files) in the build tree, so that when one has changed
sources in $src/js/src, simply running 'make' in $obj/js/src and then
re-running $obj/dist/bin/firefox will pick up the new libraries.
The js/src/Makefile.in 'install' target has many double-colon rules
with commands; we'd like to use these all in two circumstances:
. For 'make install' in a stand-alone js/src build. Since we're
following GNU behavior, this should copy the files it's installing.
. For 'make libs' in an in-tree js/src build. To interact properly
with the rest of the Mozilla build system, this should create
symlinks as explained above.
To accomplish this, we use plain old $(INSTALL) in all the install
targets, have js/src/Makefile.in set NSDISTMODE to copy (to get the
GNU behavior), and then have config/js/Makefile.in override that (to
get the Mozilla in-tree behavior).
$(MDDEPDIR) needs to be created in the build tree, but if make rules
list $(MDDEPDIR) as a dependency, then the VPATH search will tend to
find dependency directories in source trees if the source tree has
been configured in the past. So use $(CURDIR)/$(MDDEPDIR) instead.
Some directory Makefiles have been adding $(MDDEPDIR) to MAKE_DIRS and
GARBAGE_DIRS explicitly, since they're not setting any of the
variables that would cause config/rules.mk to create $(MDDEPDIR)
automatically. Those makefiles would have to use the $(CURDIR) trick
to defeat the VPATH search, too. Instead, have rules.mk check an
additional variable NEED_MDDEPDIRS, and let the makefiles set that;
this keeps the magic in one place.
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
Background:
Thread-safe SpiderMonkey needs NSPR for threading support, so it uses
the values of NSPR_CFLAGS and NSPR_LIBS to compile and link. The
configure script puts values for those variables in
$(DEPTH)/config/autoconf.mk. They're recursively expanded Make
variables, and the configure script gives them values that cite the
value of LIBXUL_DIST.
LIBXUL_DIST is itself a recursively expanded variable which usually
refers to $(DIST), but refers to $(LIBXUL_SDK) if we're building
against a separate XUL tree.
Once SpiderMonkey has its own configure script, that script should
take options specifying values to use for NSPR_CFLAGS and NSPR_LIBS.
The values we pass to it shouldn't try to reference $(LIBXUL_DIST) or
any other variable from the surrounding makefiles: a stand-alone
Spidermonkey's configuration and build system shouldn't mention LIBXUL
at all. SpiderMonkey doesn't depend on LIBXUL, only NSPR, which just
happens to be installed in the same dist directory as LIBXUL.
That means we need to compute fully-substituted values for NSPR_CFLAGS
and NSPR_LIBS, suitable for stand-alone use in the top-level configure
script, which we can pass down to the SpiderMonkey configure script
(once it has one).
The first step is to actually compute an independent value for
LIBXUL_DIST, one that doesn't refer to either $(DIST) or
$(LIBXUL_SDK). This means we need to make that choice in the
configuration script, not in autoconf.mk. Subsequent patches will use
this to compute fully-substituted values for NSPR_LIBS and NSPR_CFLAGS.
Ted Mielczarek
Jeff Walden
Antonio Gomes (tonikitoo)
Benjamin Smedberg
Walter Meinl
Doug Turner
Atsushi Sakai
Jeff Muizelaar
Serge Gautherie
Sergey Yanovich
Vladimir Vukicevic
Ginn Chen
Brad Lassey
Fabien Tassin
Arpad Borsos
Daniel Holbert
Bobby Holley
Brian Birtles
Michael Ventnor
Phil Ringnalda
Michael Ventnor
Jim Blandy
Oleg Romashin
L. David Baron
Justin Wood
Ben Hearsum
Shawn Wilsher
Neil Rashbrook
Robert O'Callahan
Jim Blandy
Andreas Gal
Matthew Gregan
Justin Dolske
Chris Double
Jason Orendorff
Riku Voipio / Mike Hommey
Axel Hecht
Karsten Düsterloh
Karl Tomlinson
Robert Kaiser
Taras Glek
Mark Banner
Brian Crowder
Armen Zambrano Gasparnian
Robert Longson
Simon Montagu
Chris Cooper