Modified: trunk/Tools/ChangeLog (96473 => 96474)
--- trunk/Tools/ChangeLog 2011-10-02 17:18:28 UTC (rev 96473)
+++ trunk/Tools/ChangeLog 2011-10-02 17:35:35 UTC (rev 96474)
@@ -1,5 +1,18 @@
2011-10-02 Adam Barth <[email protected]>
+ Clean up obsolete code in gardeningserver.py related to
+ STATIC_FILE_NAMES. Rather than serve the UI via the Python HTTP
+ server, we just serve it off the filesystem directly.
+
+ We had planned to serve the UI off build.webkit.org, but that server is
+ somewhat slow. We'll probably serve the UI of some web server, but
+ we'll need to work that out later.
+
+ * Scripts/webkitpy/tool/commands/gardenomatic.py:
+ * Scripts/webkitpy/tool/servers/gardeningserver.py:
+
+2011-10-02 Adam Barth <[email protected]>
+
Rip out half-backed garden-o-matic features in preparation for wider use
https://bugs.webkit.org/show_bug.cgi?id=69226
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/gardenomatic.py (96473 => 96474)
--- trunk/Tools/Scripts/webkitpy/tool/commands/gardenomatic.py 2011-10-02 17:18:28 UTC (rev 96473)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/gardenomatic.py 2011-10-02 17:35:35 UTC (rev 96474)
@@ -30,13 +30,12 @@
name = "garden-o-matic"
help_text = "Experimental command for gardening the WebKit tree."
- url = ""
-
def execute(self, options, args, tool):
print "This command runs a local HTTP server that changes your working copy"
print "based on the actions you take in the web-based UI."
- if tool.user.confirm("Open the web-based UI before starting the local server?"):
- self._tool.user.open_url(self.url)
+
httpd = GardeningHTTPServer(httpd_port=8127, config={'tool': tool})
+ self._tool.user.open_url(httpd.url())
+
print "Local HTTP server started."
httpd.serve_forever()
Modified: trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py (96473 => 96474)
--- trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py 2011-10-02 17:18:28 UTC (rev 96473)
+++ trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py 2011-10-02 17:35:35 UTC (rev 96474)
@@ -88,37 +88,23 @@
self.tool = config['tool']
BaseHTTPServer.HTTPServer.__init__(self, (server_name, httpd_port), GardeningHTTPRequestHandler)
+ def url(self):
+ return os.path.join(GardeningHTTPRequestHandler.STATIC_FILE_DIRECTORY, 'garden-o-matic.html')
+
class GardeningHTTPRequestHandler(ReflectionHandler):
- STATIC_FILE_NAMES = frozenset([
- "base.js",
- "Bugzilla.js",
- "builders.js",
- "checkout.js",
- "config.js",
- "favicon-green.png",
- "favicon-red.png",
- "garden-o-matic.html",
- "main.css",
- "main.js",
- "model.js",
- "net.js",
- "partytime.gif",
- "results.js",
- "Trac.js",
- "ui.js",
- ])
+ STATIC_FILE_NAMES = frozenset()
STATIC_FILE_DIRECTORY = os.path.join(
os.path.dirname(__file__),
- "..",
- "..",
- "..",
- "..",
- "BuildSlaveSupport",
- "build.webkit.org-config",
- "public_html",
- "TestFailures")
+ '..',
+ '..',
+ '..',
+ '..',
+ 'BuildSlaveSupport',
+ 'build.webkit.org-config',
+ 'public_html',
+ 'TestFailures')
allow_cross_origin_requests = True
