Commit Graph

79 Commits

Author SHA1 Message Date
Jim Blandy
f83d8c9ea3 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
Philippe M. Chiasson
c5e7d7369d Bug 454449 - client.mk doesn't gracefully fail if it can't locate autoconf; v3; r=ted.mielczarek 2008-10-23 18:24:52 +02:00
Philippe M. Chiasson
23b22dc234 Bug 454449. Backout bustage introduced in rev c966e7e41dbd 2008-10-20 22:55:04 -04:00
Philippe M. Chiasson
8f1329e7ca Bug 454449. Teach client.mk to fail more gracefully if it can't locate autoconf. r=ted.mielczarek 2008-10-20 12:07:23 -04:00
Jim Blandy
dd450ca92a Neaten up the handling of configure script regeneration in client.mk.
Add a new 'configure-files' target, just for updating
autoconf-generated files.
2008-08-26 14:34:35 -07:00
Robert Kaiser
4a7672a529 bug 450948 - Remove Mac case from AUTOCONF detection code - simple, slightly hacky, new fix, r=ted 2008-08-24 20:02:13 +02:00
Arpad Borsos
7dcef3f649 Bug 445143 - "clean mozilla-central from unneeded references to suite, mail, etc." [r=Standard8 r=ted] 2008-08-19 23:05:00 -05:00
Oleg Romashin
dbbb2a81ec Removed some not required changes which can break trunk build
Removed empty lines changes
2008-08-03 21:10:34 +03:00
Rob Campbell
b7c2978411 client.mk still includes instructions to call python client.py checkout, p=me, r=ted 2008-06-24 16:00:30 -03:00
Axel Hecht
84a59603dd bug 439078, add allmakefiles.sh to CONFIG_STATUS_DEPS, r=ted 2008-06-13 18:08:13 +02:00
bcrowder@mozilla.com
fd051a08a3 Bug 434068 - client.mk from mozilla-central does not provide CONFIG_GUESS, r=:luser, a=jorendorff 2008-05-16 12:15:53 -07:00
Ben Turner
e4211cd6cf Bug 432911 - "Hardcoded autoconf-2.13 in client.mk breaks OS X builds". r=josh, sr+a=ted. 2008-05-16 12:05:14 -07:00
benjamin@smedbergs.us
1f36c2d078 Merge cvs-trunk-mirror -> mozilla-central
--HG--
rename : js/src/js.c => js/src/js.cpp
rename : js/src/jsapi.c => js/src/jsapi.cpp
rename : js/src/jsarray.c => js/src/jsarray.cpp
rename : js/src/jsatom.c => js/src/jsatom.cpp
rename : js/src/jsdate.c => js/src/jsdate.cpp
rename : js/src/jsemit.c => js/src/jsemit.cpp
rename : js/src/jsexn.c => js/src/jsexn.cpp
rename : js/src/jsfun.c => js/src/jsfun.cpp
rename : js/src/jsgc.c => js/src/jsgc.cpp
rename : js/src/jsinterp.c => js/src/jsinterp.cpp
rename : js/src/jsiter.c => js/src/jsiter.cpp
rename : js/src/jslock.c => js/src/jslock.cpp
rename : js/src/jsmath.c => js/src/jsmath.cpp
rename : js/src/jsnum.c => js/src/jsnum.cpp
rename : js/src/jsobj.c => js/src/jsobj.cpp
rename : js/src/jsopcode.c => js/src/jsopcode.cpp
rename : js/src/jsparse.c => js/src/jsparse.cpp
rename : js/src/jsregexp.c => js/src/jsregexp.cpp
rename : js/src/jsscan.c => js/src/jsscan.cpp
rename : js/src/jsscript.c => js/src/jsscript.cpp
rename : js/src/jsstr.c => js/src/jsstr.cpp
rename : js/src/jsxml.c => js/src/jsxml.cpp
2008-03-10 17:07:41 -04:00
ted.mielczarek@gmail.com
d143c684fe bug 419348 - build config fixes for profile-guided optimization on mac. fixes for PGO on universal builds, configure arg to disable PGO in spite of profiled build. r=bsmedberg 2008-03-06 03:57:21 -08:00
benjamin@smedbergs.us
bd3ecfec1d Merge cvs-trunk-mirror -> mozilla-central
--HG--
rename : js/src/js.c => js/src/js.cpp
rename : js/src/jsapi.c => js/src/jsapi.cpp
rename : js/src/jsarena.c => js/src/jsarena.cpp
rename : js/src/jsarray.c => js/src/jsarray.cpp
rename : js/src/jsatom.c => js/src/jsatom.cpp
rename : js/src/jsbool.c => js/src/jsbool.cpp
rename : js/src/jscntxt.c => js/src/jscntxt.cpp
rename : js/src/jscpucfg.c => js/src/jscpucfg.cpp
rename : js/src/jsdate.c => js/src/jsdate.cpp
rename : js/src/jsdbgapi.c => js/src/jsdbgapi.cpp
rename : js/src/jsdhash.c => js/src/jsdhash.cpp
rename : js/src/jsemit.c => js/src/jsemit.cpp
rename : js/src/jsexn.c => js/src/jsexn.cpp
rename : js/src/jsfun.c => js/src/jsfun.cpp
rename : js/src/jsgc.c => js/src/jsgc.cpp
rename : js/src/jshash.c => js/src/jshash.cpp
rename : js/src/jsinterp.c => js/src/jsinterp.cpp
rename : js/src/jsiter.c => js/src/jsiter.cpp
rename : js/src/jslock.c => js/src/jslock.cpp
rename : js/src/jsmath.c => js/src/jsmath.cpp
rename : js/src/jsnum.c => js/src/jsnum.cpp
rename : js/src/jsobj.c => js/src/jsobj.cpp
rename : js/src/jsopcode.c => js/src/jsopcode.cpp
rename : js/src/jsparse.c => js/src/jsparse.cpp
rename : js/src/jsregexp.c => js/src/jsregexp.cpp
rename : js/src/jsscope.c => js/src/jsscope.cpp
rename : js/src/jsscript.c => js/src/jsscript.cpp
rename : js/src/jsstr.c => js/src/jsstr.cpp
rename : js/src/jsutil.c => js/src/jsutil.cpp
rename : js/src/jsxml.c => js/src/jsxml.cpp
rename : js/src/prmjtime.c => js/src/prmjtime.cpp
2008-02-22 16:45:09 -05:00
kaie@kuix.de
5f3d9f4a5d Bug 416571, Update NSPR to 4.7.1 beta 1 r=wtc, blocking1.9=mtschrep Bug 412937, Update NSS to NSS_3_12_BETA2 r=rrelyea, blocking1.9=mtschrep 2008-02-21 16:58:50 -08:00
ted.mielczarek@gmail.com
f7933e7360 bug 361343 - make profiledbuild work on windows. r=bsmedberg 2008-02-20 15:29:11 -08:00
ted.mielczarek@gmail.com
54a26abd81 bug 240267 - link error when doing make profiledbuild. r=bsmedberg 2008-02-16 14:23:07 -08:00
dholbert@cs.stanford.edu
dd51eaff72 Bug 415188: Remove duplicate CVS_CO_DATE_FLAGS from cvs checkout commands. r=ted a1.9=schrep 2008-02-12 18:30:17 -08:00
ted.mielczarek@gmail.com
8195367a9c bug 407459 - hook up new allocator to our build. just checking in the memory/jemalloc dir and the client.mk change to pull it. r=bsmedberg a=beltzner 2008-02-04 07:17:11 -08:00
reed@reedloden.com
fd7e3ba81a Upgraded the NSPR tag to NSPR_HEAD_20080129_PLUS_414997 for the fix for bug 414997. [a1.9b3=beltzner] 2008-01-31 11:56:44 -08:00
wtc@google.com
66d07ce40b Upgraded the NSPR tag to NSPR_HEAD_20080129 for the fix for bug 414392. 2008-01-29 15:41:01 -08:00
jorendorff@mozilla.com
bbea725a53 Merge from cvs-trunk-mirror to mozilla-central.
--HG--
rename : js/src/js.c => js/src/js.cpp
rename : js/src/jsapi.c => js/src/jsapi.cpp
rename : js/src/jsarray.c => js/src/jsarray.cpp
rename : js/src/jsatom.c => js/src/jsatom.cpp
rename : js/src/jsbool.c => js/src/jsbool.cpp
rename : js/src/jsdbgapi.c => js/src/jsdbgapi.cpp
rename : js/src/jsemit.c => js/src/jsemit.cpp
rename : js/src/jsfun.c => js/src/jsfun.cpp
rename : js/src/jsgc.c => js/src/jsgc.cpp
rename : js/src/jsinterp.c => js/src/jsinterp.cpp
rename : js/src/jsiter.c => js/src/jsiter.cpp
rename : js/src/jslock.c => js/src/jslock.cpp
rename : js/src/jsobj.c => js/src/jsobj.cpp
rename : js/src/jsopcode.c => js/src/jsopcode.cpp
rename : js/src/jsparse.c => js/src/jsparse.cpp
rename : js/src/jsstr.c => js/src/jsstr.cpp
rename : js/src/jsxml.c => js/src/jsxml.cpp
2008-01-28 17:32:29 -08:00
wtc@google.com
2bdd01a580 Upgraded the NSPR tag to NSPR_HEAD_20080127 to pick up the fixes for bugs 296878, 331043 (blocking1.9+), 334826 (blocking1.9+), 285157 (blocking1.9+), and 204151. 2008-01-27 17:23:01 -08:00
wtc@google.com
38d66e7797 Upgrade the NSPR tag to NSPR_HEAD_20080120 to pick up the fixes for bugs 95829/334285, 333637, and 404824 (blocking1.9+). 2008-01-20 09:56:02 -08:00
bent.mozilla@gmail.com
44a90d82a9 Bug 395059 - "Update client.mk to reflect changes from bug 381902". r=bsmedberg, a=schrep. 2008-01-18 12:17:36 -08:00
kaie@kuix.de
6dee00122d Bug 399590, Update Mozilla trunk to use NSS tag NSS_3_12_BETA1 r=rrelyea, a1.9=mtschrep 2008-01-18 02:40:58 -08:00
wtc@google.com
e66413995b Upgraded the NSPR tag to NSPR_HEAD_20080113 to pick up the fixes for bug 396509 and bug 409224, which are blocking-firefox3+ or approval1.9+. 2008-01-13 17:04:18 -08:00
wtc@google.com
a4177c854a Updated the NSPR tag to NSPR_HEAD_20071218 to pick up the fix for bug 404399 "PR_StringToNetAddr extremely slow on Mac OS X". The bug is blocking1.9+. 2007-12-19 09:40:21 -08:00
kairo@kairo.at
850e8ce097 bug 346133 - [seamonkey] pull L10n dictionaries, r=l10n@mozilla.com a=beltzner 2007-12-18 08:13:11 -08:00
kairo@kairo.at
b747161ea4 bug 405856 - pull the whole l10n/ab-CD/ dir with L10n checkout to solve the problem of pulling of optional L10n directories, r=bsmedberg,l10n@mozilla.com a=beltzner 2007-12-18 08:09:06 -08:00
rcampbell@mozilla.com
962dd5ddaf bug 397724 - Add test harness for assertions/crashes/leaks 2007-12-05 09:14:26 -08:00
jorendorff@mozilla.com
c51bec2cbf Merge from cvs-trunk-mirror to mozilla-central.
--HG--
rename : js/src/js.c => js/src/js.cpp
rename : js/src/jsapi.c => js/src/jsapi.cpp
rename : js/src/jsarray.c => js/src/jsarray.cpp
rename : js/src/jsdbgapi.c => js/src/jsdbgapi.cpp
rename : js/src/jsemit.c => js/src/jsemit.cpp
rename : js/src/jsexn.c => js/src/jsexn.cpp
rename : js/src/jsfun.c => js/src/jsfun.cpp
rename : js/src/jsinterp.c => js/src/jsinterp.cpp
rename : js/src/jsnum.c => js/src/jsnum.cpp
rename : js/src/jsobj.c => js/src/jsobj.cpp
rename : js/src/jsparse.c => js/src/jsparse.cpp
rename : js/src/jsscope.c => js/src/jsscope.cpp
rename : js/src/jsscript.c => js/src/jsscript.cpp
rename : js/src/jsxml.c => js/src/jsxml.cpp
2007-12-03 17:50:14 -06:00
reed@reedloden.com
72c521ce4c Bug 405228 - "Update build documentation link in client.mk" [p=bugzilla@babylonsounds.com (Simon 'sipaq' Paquet) r+sr=bsmedberg] 2007-11-26 15:58:59 -08:00
rrelyea@redhat.com
9eb55b8d0e Enable real EV checking. Bug 289520. patch by kai engert. review rrelyea approval mtschrep. 2007-11-21 14:28:13 -08:00
axel@pike.org
85ac421487 bug 401590, fix l10n-checkout for modularized trunk checkouts, r=bsmedberg, a=not part of fx builds 2007-11-13 02:43:11 -08:00
mozilla@weilbacher.org
26b39bc6ae Bug 399647: pull new NSPR tag to pick up OS/2 change, r/a=benjamin 2007-10-19 11:48:38 -07:00
kaie@kuix.de
883982ac02 Bug 397296, Firefox builds need to use the current NSS CVS tag r=mconnor, blocking-firefox3=benjamin 2007-10-11 12:03:05 -07:00
jst@mozilla.org
5222799aa7 Adding mozilla/probes to MODULES_core to fix solaris bustage. 2007-10-10 16:25:14 -07:00
jorendorff@mozilla.com
1895f3da4f Merge from cvs-trunk-mirror to mozilla-central.
--HG--
rename : js/src/js.c => js/src/js.cpp
rename : js/src/jsapi.c => js/src/jsapi.cpp
rename : js/src/jsdbgapi.c => js/src/jsdbgapi.cpp
rename : js/src/jsemit.c => js/src/jsemit.cpp
rename : js/src/jsfun.c => js/src/jsfun.cpp
rename : js/src/jsiter.c => js/src/jsiter.cpp
rename : js/src/jsobj.c => js/src/jsobj.cpp
rename : js/src/jsparse.c => js/src/jsparse.cpp
rename : js/src/jsregexp.c => js/src/jsregexp.cpp
rename : js/src/jsscan.c => js/src/jsscan.cpp
rename : js/src/jsscript.c => js/src/jsscript.cpp
rename : js/src/jsxml.c => js/src/jsxml.cpp
rename : js/src/prmjtime.c => js/src/prmjtime.cpp
2007-10-09 13:00:59 -05:00
bent.mozilla@gmail.com
3270cf0721 Bug 395059 - "Update client.mk to reflect changes from bug 381902". r+a=bsmedberg. 2007-09-23 21:46:24 -07:00
kairo@kairo.at
27ad6296f5 bug 394567 - Move SeaMonkey parts of mozilla/themes to suite/, followup 1.1: don't pull themes/ and remove old modern, r+sr=Neil, a=mconnor via IRC 2007-09-17 10:15:26 -07:00
wtc@google.com
01efd347e8 Bug 392852: Upgraded Mozilla trunk to NSPR_HEAD_20070820. r=wtc. a=bzbarsky 2007-08-26 12:19:47 -07:00
edward.lee@engineering.uiuc.edu
fdad7bbd1b Restore autoconf-2.13 for client.mk 2007-08-13 10:50:12 -07:00
edward.lee@engineering.uiuc.edu
eedee4d2e7 Bug 391823 - mozilla-central: Firefox build fails copying libnssdbm3.dylib to dist/bin (r=benjamin) 2007-08-13 10:46:10 -07:00
kaie@kuix.de
158ad5f0f1 Bug 390451, Remembered passwords lost when changing Master Password Update to fixed NSS snapshot r=me 2007-08-06 09:29:54 -07:00
pavlov@pavlov.net
2f128c4a41 adding lcms to the directories client.mk pulls 2007-07-23 15:23:20 -07:00
rrelyea@redhat.com
ff84fbb60d Bug 388403 Land NSS 3.12 Alpha r=kai. 2007-07-23 12:02:59 -07:00
rrelyea@redhat.com
e1e132cd72 Back out the previous change. Mac Universal failed again (even though Mac PPC
works fine for me ;().
2007-07-19 19:20:12 -07:00
rrelyea@redhat.com
88b2137605 finally land NSS 3.12 into the trunk bug 388403 2007-07-19 18:33:48 -07:00