diff options
author | Steve Block <steveblock@google.com> | 2011-05-06 11:45:16 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-12 13:44:10 +0100 |
commit | cad810f21b803229eb11403f9209855525a25d57 (patch) | |
tree | 29a6fd0279be608e0fe9ffe9841f722f0f4e4269 /Tools/BuildSlaveSupport/build.webkit.org-config/config.json | |
parent | 121b0cf4517156d0ac5111caf9830c51b69bae8f (diff) | |
download | external_webkit-cad810f21b803229eb11403f9209855525a25d57.zip external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.gz external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.bz2 |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Diffstat (limited to 'Tools/BuildSlaveSupport/build.webkit.org-config/config.json')
-rw-r--r-- | Tools/BuildSlaveSupport/build.webkit.org-config/config.json | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json index 19d7535..6e03f7a 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json @@ -57,6 +57,8 @@ { "name": "google-new-tests", "platform": "mac-leopard" }, { "name": "wincairo-1", "platform": "wincairo" }, + + { "name": "wince-1", "platform": "wince" }, { "name": "efl-linux-slave-1", "platform": "efl" } ], @@ -214,6 +216,11 @@ "slavenames": ["wincairo-1"] }, { + "name": "WinCE Release (Build)", "type": "Build", "builddir": "wince-release", + "platform": "wince", "configuration": "release", "architectures": ["i386"], + "slavenames": ["wince-1"] + }, + { "name": "EFL Linux Release (Build)", "type": "Build", "builddir": "efl-linux-release", "platform": "efl", "configuration": "release", "architectures": ["i386"], "slavenames": ["efl-linux-slave-1"] @@ -228,7 +235,7 @@ "Qt Windows 32-bit Release", "Qt Windows 32-bit Debug", "Chromium Win Release", "Chromium Mac Release", "Chromium Linux Release", "Chromium Win Release (Tests)", "Chromium Mac Release (Tests)", "Chromium Linux Release (Tests)", - "WinCairo Debug (Build)", "EFL Linux Release (Build)"] + "WinCairo Debug (Build)", "WinCE Release (Build)", "EFL Linux Release (Build)"] }, { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0, "builderNames": ["Windows Release (Build)", "Windows Debug (Build)"] |