From 38ef664418bcb8f37971a36b6edd30024b12e7fb Mon Sep 17 00:00:00 2001 From: "houssainy@google.com" Date: Thu, 4 Sep 2014 13:44:47 +0000 Subject: [PATCH] Moving the api.js and bot.js to /rtcbot/bot/ to be shared between /borwser and /android R=andresp@webrtc.org Review URL: https://webrtc-codereview.appspot.com/25369004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7062 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/tools/rtcbot/bot/{browser => }/api.js | 0 webrtc/tools/rtcbot/bot/{browser => }/bot.js | 0 webrtc/tools/rtcbot/bot/{browser => }/index.html | 0 webrtc/tools/rtcbot/botmanager.js | 10 +++++----- 4 files changed, 5 insertions(+), 5 deletions(-) rename webrtc/tools/rtcbot/bot/{browser => }/api.js (100%) rename webrtc/tools/rtcbot/bot/{browser => }/bot.js (100%) rename webrtc/tools/rtcbot/bot/{browser => }/index.html (100%) diff --git a/webrtc/tools/rtcbot/bot/browser/api.js b/webrtc/tools/rtcbot/bot/api.js similarity index 100% rename from webrtc/tools/rtcbot/bot/browser/api.js rename to webrtc/tools/rtcbot/bot/api.js diff --git a/webrtc/tools/rtcbot/bot/browser/bot.js b/webrtc/tools/rtcbot/bot/bot.js similarity index 100% rename from webrtc/tools/rtcbot/bot/browser/bot.js rename to webrtc/tools/rtcbot/bot/bot.js diff --git a/webrtc/tools/rtcbot/bot/browser/index.html b/webrtc/tools/rtcbot/bot/index.html similarity index 100% rename from webrtc/tools/rtcbot/bot/browser/index.html rename to webrtc/tools/rtcbot/bot/index.html diff --git a/webrtc/tools/rtcbot/botmanager.js b/webrtc/tools/rtcbot/botmanager.js index 420123733..667c1e8c0 100644 --- a/webrtc/tools/rtcbot/botmanager.js +++ b/webrtc/tools/rtcbot/botmanager.js @@ -41,11 +41,11 @@ BotManager.prototype = { this.app_ = new Express(); - this.app_.use('/bot/browser/api.js', + this.app_.use('/bot/api.js', this.serveBrowserifyFile_.bind(this, - __dirname + '/bot/browser/api.js')); + __dirname + '/bot/api.js')); - this.app_.use('/bot/browser/', Express.static(__dirname + '/bot/browser')); + this.app_.use('/bot/', Express.static(__dirname + '/bot')); this.server_ = http.createServer(this.app_); @@ -97,7 +97,7 @@ Bot.prototype = { } } -// BrowserBot spawns a process to open "http://localhost:8080/bot/browser/". +// BrowserBot spawns a process to open "http://localhost:8080/bot/". // // That page once loaded, connects to the websocket server run by BotManager // and exposes the bot api. @@ -109,7 +109,7 @@ BrowserBot = function (name, callback) { BrowserBot.prototype = { spawnBotProcess_: function () { this.log('Spawning browser'); - child.exec('google-chrome "http://localhost:8080/bot/browser/"'); + child.exec('google-chrome "http://localhost:8080/bot/"'); }, __proto__: Bot.prototype