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

Merge branch 'master' of ssh://aaron@git.10gen.com/data/gitroot/p

This commit is contained in:
Aaron 2009-02-09 11:42:50 -05:00
commit 1f7c7ff9d0
2 changed files with 7 additions and 7 deletions

View File

@ -442,7 +442,7 @@ Default( env.Program( "mongod" , commonFiles + coreDbFiles + serverOnlyFiles + [
# tools
allToolFiles = allClientFiles + [ "tools/Tool.cpp" ]
env.Program( "mongodump" , allToolFiles + [ "tools/dump.cpp" ] )
env.Program( "mongorestore" , allToolFiles + [ "tools/import.cpp" ] )
env.Program( "mongorestore" , allToolFiles + [ "tools/restore.cpp" ] )
env.Program( "mongoexport" , allToolFiles + [ "tools/export.cpp" ] )
env.Program( "mongoimportjson" , allToolFiles + [ "tools/importJSON.cpp" ] )

View File

@ -1,4 +1,4 @@
// import.cpp
// restore.cpp
/**
* Copyright (C) 2008 10gen Inc.
@ -29,11 +29,11 @@ using namespace mongo;
namespace po = boost::program_options;
class Import : public Tool {
class Restore : public Tool {
public:
Import() : Tool( "import" ){
Restore() : Tool( "restore" ){
add_options()
("dir",po::value<string>() , "directory to import from" )
("dir",po::value<string>() , "directory to restore from" )
;
addPositionArg( "dir" , 1 );
}
@ -109,6 +109,6 @@ public:
};
int main( int argc , char ** argv ) {
Import import;
return import.main( argc , argv );
Restore restore;
return restore.main( argc , argv );
}