diff options
| author | Dwight <dwight@10gen.com> | 2010-07-12 19:03:08 -0400 |
|---|---|---|
| committer | Dwight <dwight@10gen.com> | 2010-07-12 19:03:08 -0400 |
| commit | 0fdde00115c7b4c5c1c2da5238f0d10a74caa20e (patch) | |
| tree | 27bdf9e5e6daa4262980c344cecffe277ff36c81 /SConstruct | |
| parent | 0139397922d08e123bebd9c3046547f939ef0ac4 (diff) | |
| parent | 3e35041c3c59651e284ec309abceba74379a05ca (diff) | |
| download | mongo-0fdde00115c7b4c5c1c2da5238f0d10a74caa20e.tar.gz | |
Merge branch 'master' of github.com:mongodb/mongo
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 975ac2da62a..9321ae59e91 100644 --- a/SConstruct +++ b/SConstruct @@ -390,7 +390,7 @@ commonFiles += [ "util/background.cpp" , "util/mmap.cpp" , "util/ramstore.cpp", "util/concurrency/thread_pool.cpp", "util/password.cpp", "util/version.cpp", "util/histogram.cpp", "util/concurrency/spin_lock.cpp", "util/text.cpp" , "util/stringutils.cpp" ] commonFiles += Glob( "util/*.c" ) -commonFiles += Split( "client/connpool.cpp client/dbclient.cpp client/dbclientcursor.cpp client/model.cpp client/syncclusterconnection.cpp s/shardconnection.cpp" ) +commonFiles += Split( "client/connpool.cpp client/dbclient.cpp client/dbclientcursor.cpp client/model.cpp client/syncclusterconnection.cpp client/distlock.cpp s/shardconnection.cpp" ) #mmap stuff @@ -435,7 +435,7 @@ coreServerFiles += scriptingFiles coreShardFiles = [ "s/config.cpp" , "s/chunk.cpp" , "s/shard.cpp" , "s/shardkey.cpp" ] shardServerFiles = coreShardFiles + Glob( "s/strategy*.cpp" ) + [ "s/commands_admin.cpp" , "s/commands_public.cpp" , "s/request.cpp" , "s/cursors.cpp" , "s/server.cpp" , "s/config_migrate.cpp" , "s/s_only.cpp" , "s/stats.cpp" , "s/balance.cpp" , "s/balancer_policy.cpp" , "db/cmdline.cpp" ] -serverOnlyFiles += coreShardFiles + [ "s/d_logic.cpp" , "s/d_writeback.cpp" , "s/d_migrate.cpp" , "s/d_state.cpp" , "s/d_split.cpp" ] +serverOnlyFiles += coreShardFiles + [ "s/d_logic.cpp" , "s/d_writeback.cpp" , "s/d_migrate.cpp" , "s/d_state.cpp" , "s/d_split.cpp" , "client/distlock_test.cpp" ] serverOnlyFiles += [ "db/module.cpp" ] + Glob( "db/modules/*.cpp" ) |