Commit Graph

101 Commits

Author SHA1 Message Date
Ed Morley
c3786e0f0f Bug 707512 - Abort Windows Pymake builds with a clearer error if MOZ_OBJDIR is an MSYS style path; r=ted 2011-12-08 20:02:26 +00:00
Ed Morley
221981eca8 Bug 643167 - js/src configure should build js-config with MAKE, not GMAKE (based on patch by Kyle Huey); r=ted
* Switches js-config generation to use $MAKE rather than $GMAKE, since using
  make.exe on pymake builds causes issues:
  "config/autoconf.mk:354: *** Windows-style srcdir being used with GNU make"
* Ensures $MAKE is defined for configure when using client.mk
* For standalone js builds client.mk won't be used, so sets $MAKE manually if it
  isn't already defined, to avoid bug 605133 comment 22.
2011-12-08 20:02:26 +00:00
Chris AtLee
aa6338033f Bug 481815: makefile hooks required for signing executable files, installer packages, and mars. r=ted
--HG--
extra : rebase_source : 7b696910865fdbc9191cb7511f558879a9b9e05d
2011-12-07 17:06:52 -05:00
Neil Rashbrook
1528fd81d5 Bug 684617 client.mk runs configure twice r=khuey 2011-09-07 20:08:36 +01:00
Kyle Huey
0e75aa6dec Back out Bug 659311 which made it to m-c prematurely. 2011-08-19 13:16:24 -04:00
Mike Hommey
cdfea56b19 Bug 659311 - Avoid clobber between profile generate and use passes of PGO builds. r=ted 2011-05-24 16:19:15 +02:00
Mike Hommey
f7145bb273 Bug 677577 - Force an early failure when check-sync-dirs.py fails. r=ted 2011-08-16 09:35:17 +02:00
Joey Armstrong
d2f242ead3 Bug 666908: Remove MAKE:=gmake. Fix editor colorization quoting problem. r=khuey 2011-06-24 15:00:04 -04:00
Matt Brubeck
27d39ad214 Back out 9fc0e6867256, 6947bbce9672, fb91a23bd158, a5870dd2ad7c, c3d3292fbd1e, 42f2aca1fde9 to fix Android failures on a CLOSED TREE 2011-07-01 11:20:52 -07:00
Joey Armstrong
a4f7fd8a7e Bug 666908: Remove MAKE:=gmake. Fix editor colorization quoting problem. r=khuey 2011-06-24 15:00:04 -04:00
Michael Wu
f809394c0f Bug 641614 - Fix reordering of localized files in omnijar, r=ted 2011-06-10 17:54:01 -07:00
Mike Hommey
78f6262ffd Bug 643704 - Allow to trigger PGO builds through mozconfig. r=ted 2011-03-25 19:50:29 +01:00
Kyle Huey
bc05b06c0e Bug 644164: Make configure depend on the Firefox version. r=ted 2011-03-23 13:24:53 -04:00
Justin Wood
9e9e11865a Bug 608036 - Cleanup some of client.mk r=khuey a=NPOTB
--HG--
extra : rebase_source : fbf93e2ba4ea8c8e83dce84424c808accae6c566
2010-10-28 14:15:15 -04:00
Michael Wu
d5fc5a0de5 Bug 589971 - Omnijar before profiling part of PGO, r=ted a=beltzner 2010-09-09 16:12:08 -04:00
Kyle Huey
49e431d43d Bug 578563: Make objdir builds the default when using client.mk. r=ted a2.0=bs 2010-08-21 09:24:34 -04:00
Neil Rashbrook
2bc3783f07 Bug 572529 Make it even easier to build with pymake r=ted 2010-06-30 12:45:21 +01:00
Vladimir Vukicevic
3e4e7227cc dummy commit 2009-09-02 00:27:27 -07:00
Chris AtLee
80e30b821f bug 445191 - Add upload target for xulrunner, upload SDK if it exists, and add 'sdk', 'upload' targets to client.mk. r=ted 2009-03-31 09:43:31 -04:00
Serge Gautherie
d05bbbc4ba Bug 480680 - nsprpub/configure often gets this unwanted(!?) local modification; (Av1a) No more autoconf; r=(ted.mielczarek + wtc) 2009-03-21 00:38:50 +01:00
Benjamin Smedberg
702b16f68a Bug 483856 - Use core_abspath and $(CURDIR) instead of shells. Use Preprocessor.py instead of preprocessor.pl to avoid perl insanity with pymake, and generally just make me happy. r=ted 2009-03-11 18:39:24 -04:00
Blake Kaplan
f070fe7877 Bug 422986 - client.mk doesn't support parallel make. r=ted 2009-02-19 18:23:17 +01:00
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