0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00

Merge branch 'master' of git@github.com:mongodb/mongo

This commit is contained in:
Dwight 2010-02-23 12:31:05 -05:00
commit e7365d7c92

View File

@ -1081,13 +1081,10 @@ Default( mongod )
# tools
allToolFiles = commonFiles + coreDbFiles + serverOnlyFiles + [ "client/gridfs.cpp", "tools/tool.cpp" ]
env.Program( "mongodump" , allToolFiles + [ "tools/dump.cpp" ] )
env.Program( "mongorestore" , allToolFiles + [ "tools/restore.cpp" ] )
env.Program( "mongoexport" , allToolFiles + [ "tools/export.cpp" ] )
env.Program( "mongoimport" , allToolFiles + [ "tools/import.cpp" ] )
env.Program( "mongofiles" , allToolFiles + [ "tools/files.cpp" ] )
normalTools = [ "dump" , "restore" , "export" , "import" , "files" ]
env.Alias( "tools" , [ "mongo" + x for x in normalTools ] )
for x in normalTools:
env.Program( "mongo" + x , allToolFiles + [ "tools/" + x + ".cpp" ] )
env.Program( "mongobridge" , allToolFiles + [ "tools/bridge.cpp" ] )
@ -1489,13 +1486,8 @@ def installBinary( e , name ):
if nix:
e.AddPostAction( inst , e.Action( 'chmod 755 ' + fullInstallName ) )
installBinary( env , "mongodump" )
installBinary( env , "mongorestore" )
installBinary( env , "mongoexport" )
installBinary( env , "mongoimport" )
installBinary( env , "mongofiles" )
for x in normalTools:
installBinary( env , "mongo" + x )
if mongosniff_built:
installBinary(env, "mongosniff")