Skip to content

Commit d709cc8

Browse files
committed
Add version information support
1 parent 545ba2f commit d709cc8

File tree

11 files changed

+119
-300
lines changed

11 files changed

+119
-300
lines changed

src/chrome/common/chrome_version_info.cc

Lines changed: 0 additions & 140 deletions
This file was deleted.

src/chrome/common/chrome_version_info.h

Lines changed: 0 additions & 92 deletions
This file was deleted.

src/chrome/common/chrome_version_info_posix.cc

Lines changed: 0 additions & 50 deletions
This file was deleted.

src/chrome/common/chrome_version_info_posix.h

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/chrome/test/webdriver/webdriver_dispatch.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
#include "base/sys_info.h"
2626
//#include "base/threading/platform_thread.h"
2727
//#include "base/threading/thread.h"
28-
#include "chrome/common/chrome_version_info.h"
2928
#include "chrome/test/webdriver/commands/command.h"
3029
#include "chrome/test/webdriver/http_response.h"
3130
#include "chrome/test/webdriver/webdriver_logging.h"
3231
#include "chrome/test/webdriver/webdriver_session_manager.h"
3332
#include "chrome/test/webdriver/webdriver_switches.h"
3433
#include "chrome/test/webdriver/webdriver_util.h"
34+
#include "versioninfo.h"
3535

3636
#include <QtCore/QDebug>
3737

@@ -118,11 +118,11 @@ void SendStatus(struct mg_connection* connection,
118118
const struct mg_request_info* request_info,
119119
void* user_data) {
120120
//TODO: need to check what info we shoud send
121-
chrome::VersionInfo version_info;
121+
VersionInfo version_info;
122122

123123
DictionaryValue* build_info = new DictionaryValue;
124124
build_info->SetString("time",
125-
base::StringPrintf("%s %s PST", __DATE__, __TIME__));
125+
base::StringPrintf("%s PST", version_info.BuildDateTime().c_str()));
126126
build_info->SetString("version", version_info.Version());
127127
build_info->SetString("revision", version_info.LastChange());
128128

src/chrome/test/webdriver/webdriver_server.cc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
#include "chrome/test/webdriver/webdriver_util.h"
6565
#include "mongoose.h"
6666
#include "base/json/json_reader.h"
67+
#include "versioninfo.h"
6768
#include <WebDriver.h>
6869

6970
#if defined(OS_WIN)
@@ -355,6 +356,15 @@ int RunChromeDriver() {
355356
return (EXIT_SUCCESS);
356357
}
357358

359+
if (cmd_line->HasSwitch("version"))
360+
{
361+
VersionInfo version_info;
362+
std::cout <<version_info.CreateVersionString()<< std::endl;
363+
364+
365+
return (EXIT_SUCCESS);
366+
}
367+
358368
#if defined(OS_WIN)
359369
system("qtvars.bat vsvars");
360370
#endif
@@ -538,6 +548,7 @@ bool parse_config_to_cmd_line()
538548
cmd_line->AppendSwitchASCII("http-threads", base::IntToString(http_threads));
539549
if (result_dict->GetString("log-path", &log_path))
540550
cmd_line->AppendSwitchASCII("log-path", log_path);
551+
541552
}
542553
else
543554
{

0 commit comments

Comments
 (0)