0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-29 00:32:18 +01:00
Commit Graph

15 Commits

Author SHA1 Message Date
Eric Milkie
8214ffd81c SERVER-9771 allow libdeps to process emitter intermediate output with targets that may be strings 2013-09-12 16:05:43 -04:00
Andrew Morrow
73ce2fd28b SERVER-9766 Don't fail the build on missing system libraries unless they are in demand 2013-09-11 16:46:52 -04:00
Andy Schwerin
7711aed31d SERVER-9670 Use LIBDEPS to declare dependents in addition to prerequisites.
To achieve this, the "direct prerequisites" for a File node are stored in the
node's attributes object, instead of in the build environment for the node.
This allows the emitter for nodes to amend _other nodes_ prerequisites.  After that,
this change is trivial.  Introduce a LIBDEPS_DEPENDENTS environment variable that sets
the named dependents of a node, while the existing LIBDEPS variable may be considered
the direct prerequisites.
2013-07-09 16:11:48 -04:00
Eric Milkie
db76ce6eef Fix SYSLIBDEPS to not add empty libraries to link list, to match LIBDEPS' behavior 2013-06-06 15:05:29 -04:00
Andy Schwerin
7cbbcbbb04 SERVER-7490 Fix SYSLIBDEPS when a syslibdep is specified as a file path.
Also, don't sort syslibdeps, since order matters on some OSes.
2013-01-03 18:30:53 -05:00
Andy Schwerin
4bfc3bc15e SERVER-7410 Fix SYSLIBDEPS functionality
The previous implementation was not recursively following the LIBDEPS hierarchy, looking for SYSLIBDEPS
to add.  Instead, it was trying to walk a hierachy like LIBDEPS rooted in the SYSLIBDEPS variable.  This
isn't really a meaningful behavior, since SYSLIBDEPS always list system libraries, which are always leaf
nodes in the dependency graph for our build system.
2012-10-23 11:38:28 -04:00
Andrew Schwerin
645aa49773 SERVER-6960 Always link object files and static archives in the same order.
SCons (correctly) considers two link command lines different if the order of
object files or static libraries changes.  As a result, the libdeps system needs
to produce consistent ordering of these files in the $_LIBDEPS expansion.  This
patch achieves this by sorting the _LIBDEPS candidate expansion by the string
name of the expanded objects.

This problem is akin to that from SERVER-5254, which was solved in a similar
manner.
2012-09-07 14:18:42 -04:00
Andy Schwerin
4de20c728f Add libdeps to signatures for built items. 2012-08-10 13:19:32 -04:00
Andy Schwerin
5455f1d95c SERVER-5254: Make LIBDEPS dependency order stable across SCons invocations.
Turns out that SCons.Node objects are compared on object identity (pointer),
not some value that's stable across invocations of SCons.  We now sort by
the "name" of the node (its string representation), instead, which stops
spurious builds.
2012-03-30 13:20:40 -04:00
Eliot Horowitz
79c18c7270 hopefully last 32-bit solaris hack, seems to work for all 3 types of binaries 2012-01-30 16:12:24 -05:00
Eliot Horowitz
b86748469f fix windows python issue 2012-01-30 15:59:39 -05:00
Eliot Horowitz
5cca648b60 different hack for 32-bit solaris 2012-01-30 15:43:45 -05:00
Andy Schwerin
fe7421e8f0 SCons: Modify the libdeps module to support two methods for linking libdeps into programs.
This is used to fix linking of programs on Windows that depend on static
initializer execution in object files that don't contain symbols referenced
directly by the program at compile time (i.e., Command registration).

It also unifies the compilation of these sorts of programs on Windows and POSIX
systems, eliminating the use of a MergeLibrary when linking mongod and mongos.

This extension to libdeps could also be used to reimagine MergeLibrary to have
an implementation shared between Posix and Windows systems.  The existing
MergeLibrary system uses relocatable objects on Posix systems, and thus could
behave differently from the one on Windows, with respect to the exeuction of
static initializers.  That change is recommended future work.
2012-01-20 22:33:40 -08:00
Andy Schwerin
f6fc6431bf Fix build break for old versions of SCons.
Newer versions of SCons are more consistent about making lists out of TARGET and
SOURCE fields than older (1.2.0 and older) versions.  This patch bandaids that
problem, which was exposed by the libdeps module.
2012-01-17 17:01:15 -08:00
Andy Schwerin
30668e1c79 SCons updates to support variant directories.
This patch is a reorganization of our build files, which brings them slightly
closer in line with standard SCons organization.

In particular, the SConstruct file sets up the various "build environment"
objects, by examining the local system and command line parameters.  Then, it
delegates to some SConscript files, which describe build rules, like how to
compile "mongod" from source.

Typically, you would create several SConscript files for a project this large,
after breaking the project into logical sub projects, such as "platform
abstraction", "data manager", "query optimizer", etc.  That will be future work.
For now, we only separate out the special rules for executing smoke tests into
SConscript.smoke.  Pretty much all other build rules are in src/mongo/SConscript.

"tools" are placed in site_scons/site_tools.

This patch also includes better support for building and tracking dependencies
among static libraries ("libdeps" and "MergeLibrary"), and some incumbent, minor
restructuring.

This patch introduces a "warning" message from SCons about framework.o having
two rules that generate it.  It is harmless, for now, and will be removed in
future work.

Future work also includes eliminating use of the SCons "Glob" utility, and
restructuring the source code into sensible components.
2012-01-17 14:58:51 -08:00