WebKitSite, BugsSite, and PlanetWebKit should move to Sites/webkit.org, Sites/bugs.webkit.org, and Sites/planet.webkit.org, respectively.
The patch is 18MB but I can only upload 2MB patches... Can I request a review without an actual patch?
This is the only non-trivial part: Index: Scripts/webkitpy/layout_tests/port/base.py =================================================================== --- Scripts/webkitpy/layout_tests/port/base.py (revision 74332) +++ Scripts/webkitpy/layout_tests/port/base.py (working copy) @@ -115,8 +115,8 @@ # http://bugs.python.org/issue3210 self._wdiff_available = True - self._pretty_patch_path = self.path_from_webkit_base("BugsSite", - "PrettyPatch", "prettify.rb") + self._pretty_patch_path = self.path_from_webkit_base("Sites", + "bugs.webkit.org", "PrettyPatch", "prettify.rb") self._pretty_patch_available = True self.set_option_default('configuration', None) if self._options.configuration is None: Index: Scripts/webkitpy/style/main.py =================================================================== --- Scripts/webkitpy/style/main.py (revision 74332) +++ Scripts/webkitpy/style/main.py (working copy) @@ -80,8 +80,8 @@ # using path-based heuristics rather than using only the # presence of a WebKit checkout. For example, we could # examine parent directories until a directory is found - # containing JavaScriptCore, WebCore, WebKit, WebKitSite, - # and WebKitTools. + # containing JavaScriptCore, WebCore, WebKit, Sites, + # and Tools. # Then log an INFO message saying that a source root not # in a WebKit checkout was found. This will allow us to check # the style of non-scm copies of the source tree (e.g. Index: Scripts/webkitpy/common/config/build_unittest.py =================================================================== --- Scripts/webkitpy/common/config/build_unittest.py (revision 74332) +++ Scripts/webkitpy/common/config/build_unittest.py (working copy) @@ -27,8 +27,8 @@ class ShouldBuildTest(unittest.TestCase): _should_build_tests = [ - (["BugsSite/foo", "WebCore/bar"], ["*"]), - (["BugsSite/foo"], []), + (["Sites/bugs.webkit.org/foo", "WebCore/bar"], ["*"]), + (["Sites/bugs.webkit.org/foo"], []), (["JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-leopard", "mac-snowleopard"]), (["JavaScriptGlue/foo", "WebCore/bar"], ["*"]), (["JavaScriptGlue/foo"], ["mac-leopard", "mac-snowleopard"]), Index: Scripts/webkitpy/common/config/build.py =================================================================== --- Scripts/webkitpy/common/config/build.py (revision 74332) +++ Scripts/webkitpy/common/config/build.py (working copy) @@ -41,12 +41,10 @@ directories = [ # Directories that shouldn't trigger builds on any bots. - ("BugsSite", []), ("PageLoadTests", []), - ("PlanetWebKit", []), ("WebCore/manual-tests", []), ("Examples", []), - ("WebKitSite", []), + ("Sites", []), ("android", []), ("brew", []), ("efl", []), Index: Scripts/webkitpy/common/prettypatch.py =================================================================== --- Scripts/webkitpy/common/prettypatch.py (revision 74332) +++ Scripts/webkitpy/common/prettypatch.py (working copy) @@ -53,7 +53,8 @@ return "" pretty_patch_path = os.path.join(self._checkout_root, - "BugsSite", "PrettyPatch") + "Sites", "bugs.webkit.org", + "PrettyPatch") prettify_path = os.path.join(pretty_patch_path, "prettify.rb") args = [ "ruby", Index: Scripts/old-run-webkit-tests =================================================================== --- Scripts/old-run-webkit-tests (revision 74332) +++ Scripts/old-run-webkit-tests (working copy) @@ -1970,7 +1970,7 @@ system "diff -u \"$copiedExpectedResultsPath\" \"$actualResultsPath\" > \"$diffOutputPath\""; my $prettyDiffOutputPath = "$diffOuputBasePath-$prettyDiffTag.html"; - my $prettyPatchPath = "BugsSite/PrettyPatch/"; + my $prettyPatchPath = "Sites/bugs.webkit.org/PrettyPatch/"; my $prettifyPath = "$prettyPatchPath/prettify.rb"; system "ruby -I \"$prettyPatchPath\" \"$prettifyPath\" \"$diffOutputPath\" > \"$prettyDiffOutputPath\""; } Index: ChangeLog =================================================================== --- ChangeLog (revision 74335) +++ ChangeLog (working copy) @@ -1,3 +1,19 @@ +2010-12-20 Adam Barth <abarth@webkit.org> + + Reviewed by NOBODY (OOPS!). + + Move web sites to Sites directory + https://bugs.webkit.org/show_bug.cgi?id=51323 + + Update references to BugsSite to point to the new location. + + * Scripts/old-run-webkit-tests: + * Scripts/webkitpy/common/config/build.py: + * Scripts/webkitpy/common/config/build_unittest.py: + * Scripts/webkitpy/common/prettypatch.py: + * Scripts/webkitpy/layout_tests/port/base.py: + * Scripts/webkitpy/style/main.py: + 2010-12-20 Ryuan Choi <ryuan.choi@samsung.com> Reviewed by Antonio Gomes.
I would probably Just named it Sites/www. Also, don't forget queues. :)
(In reply to comment #3) > I would probably Just named it Sites/www. Why? www.webkit.org redirects you to webkit.org and doesn’t contain any content itself.
Cause then they could all have nice short sub-domain names. like Sites/bugs, Sites/build Sites/queues, etc. But my level of passion on this subject is pretty low. :)
(In reply to comment #5) > Cause then they could all have nice short sub-domain names. like Sites/bugs, Sites/build Sites/queues, etc. But my level of passion on this subject is pretty low. :) I don’t think abbreviating for the sake of it makes things clearer. It’s not like these are paths that people need to frequently type. Adam, I’d say go ahead and do this unless you hear any complaints.
> Adam, I’d say go ahead and do this unless you hear any complaints. Ok. I'll probably land tonight. Thoughts on Sites versus Websites for the directory name?
I just landed this in a few pieces finishing in http://trac.webkit.org/changeset/74396. I'd be much obliged if wms or bdash would work whatever server magic needs working after this change.
I have updated the servers. (btw, bdash doesn't work on the servers anymore)
(In reply to comment #9) > I have updated the servers. Thanks! > (btw, bdash doesn't work on the servers anymore) Ah ok, but he owns one or more of the build slaves?
(In reply to comment #10) > (In reply to comment #9) > > (btw, bdash doesn't work on the servers anymore) > > Ah ok, but he owns one or more of the build slaves? I believe so.