diff options
author | Andy Schwerin <schwerin@10gen.com> | 2012-01-04 11:30:29 -0800 |
---|---|---|
committer | Andy Schwerin <schwerin@10gen.com> | 2012-01-17 14:58:51 -0800 |
commit | 30668e1c79cf6e8dac45a61b64694c045e1a59f5 (patch) | |
tree | da617cbf9d6c85c62564e48e2639d516e746a836 /.gitignore | |
parent | 8a002c30c6d6749f87c618b61d3f58d54696bb7a (diff) | |
download | mongo-30668e1c79cf6e8dac45a61b64694c045e1a59f5.tar.gz |
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.
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 82 |
1 files changed, 35 insertions, 47 deletions
diff --git a/.gitignore b/.gitignore index 82a9d95186e..71b9f9a6e68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ -.jsdbshell -.dbshell -.sconsign.dblite -.sconf_temp -perf.data -massif.out.* +/build +/.jsdbshell +/.dbshell +/.sconsign.dblite +/.sconf_temp +/perf.data +/massif.out.* *~ *.swp @@ -17,7 +18,6 @@ massif.out.* *.ncb *.idb *.obj -*/*.obj *.opt *.pch *.jsh @@ -36,8 +36,6 @@ massif.out.* *.psess *# .#* -/src/mongo/shell/mongo.cpp -/src/mongo/shell/mongo-server.cpp /src/mongo/*/*Debug/ /src/mongo/*/*/*Debug/ @@ -50,7 +48,6 @@ massif.out.* /src/mongo/db/_ReSharper.db config.log settings.py -buildinfo.cpp tags TAGS failfile.smoke @@ -67,50 +64,47 @@ scratch # binaries /mongo -mongod -mongogrid -mongos +/mongod +/mongogrid +/mongos -mongodump -mongorestore +/mongodump +/mongorestore -mongofiles -mongoexport +/mongofiles +/mongoexport -mongoimport -mongosniff -mongobridge -mongostat -mongotop -mongooplog -mongoperf -bsondump +/mongoimport +/mongosniff +/mongobridge +/mongostat +/mongotop +/mongooplog +/mongoperf +/bsondump *.tgz *.zip *.tar.gz -mongodb-* -mongo-cxx-driver-* - #libs -libmongoclient.* -libmongotestfiles.* -libmongoshellfiles.* +/libmongoclient.* +/libmongotestfiles.* +/libmongoshellfiles.* # examples -firstExample -secondExample -whereExample -bsondemo -rsExample +/firstExample +/secondExample +/whereExample +/bsondemo +/rsExample #tests -test -authTest -perftest -clientTest -httpClientTest +/test +/authTest +/perftest +/clientTest +/httpClientTest #debian build-stamp @@ -122,12 +116,6 @@ debian/mongodb #osx .DS_Store -#third party -src/third_party/js-1.7/jsautocfg.h -src/third_party/js-1.7/jsautokw.h -src/third_party/js-1.7/jskwgen -src/third_party/js-1.7/jscpucfg - # QtCreator *.config *.creator |