diff options
author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /Tools/EWSTools | |
parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'Tools/EWSTools')
-rw-r--r-- | Tools/EWSTools/boot.sh | 30 | ||||
-rwxr-xr-x | Tools/EWSTools/create-webkit-git | 42 | ||||
-rw-r--r-- | Tools/EWSTools/screen-config | 4 | ||||
-rwxr-xr-x | Tools/EWSTools/start-queue.sh | 55 | ||||
-rw-r--r-- | Tools/EWSTools/ubuntu-ews-packages | 61 |
5 files changed, 192 insertions, 0 deletions
diff --git a/Tools/EWSTools/boot.sh b/Tools/EWSTools/boot.sh new file mode 100644 index 0000000..733441e --- /dev/null +++ b/Tools/EWSTools/boot.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# Copyright (c) 2010 Google Inc. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +screen -c ~/tools/screen-config diff --git a/Tools/EWSTools/create-webkit-git b/Tools/EWSTools/create-webkit-git new file mode 100755 index 0000000..cbf8ce4 --- /dev/null +++ b/Tools/EWSTools/create-webkit-git @@ -0,0 +1,42 @@ +#/bin/bash +# Copyright (c) 2010 Google Inc. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# These are meant to match the instructions from: +# http://trac.webkit.org/wiki/UsingGitWithWebKit +cd /mnt/git +git clone git://git.webkit.org/WebKit.git webkit +cd webkit + +git svn init -T trunk http://svn.webkit.org/repository/webkit +git update-ref refs/remotes/trunk origin/master +# It's possible that this "config" step can get merged into an earlier setup step. +git config --replace-all svn-remote.svn.fetch trunk:refs/remotes/origin/master + +git fetch +git svn rebase diff --git a/Tools/EWSTools/screen-config b/Tools/EWSTools/screen-config new file mode 100644 index 0000000..5c003df --- /dev/null +++ b/Tools/EWSTools/screen-config @@ -0,0 +1,4 @@ +screen -t style ./start-queue.sh style-queue +screen -t qt ./start-queue.sh qt-ews +screen -t kr ./start-queue.sh chromium-ews +screen -t gtk ./start-queue.sh gtk-ews diff --git a/Tools/EWSTools/start-queue.sh b/Tools/EWSTools/start-queue.sh new file mode 100755 index 0000000..b511c11 --- /dev/null +++ b/Tools/EWSTools/start-queue.sh @@ -0,0 +1,55 @@ +#!/bin/sh +# Copyright (c) 2010 Google Inc. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +if [[ $# -ne 2 ]];then +echo "Usage: start-queue.sh QUEUE_NAME BOT_ID" +echo +echo "QUEUE_NAME will be passed as a command to webkit-patch" +echo "QUEUE_NAME will also be used as the path to the queue: /mnt/git/webkit-QUEUE_NAME" +echo "BOT_ID may not have spaces. It will appear as the bots name on queues.webkit.org" +echo +echo "For example, to run the mac-ews on a machine we're calling 'eseidel-cq-sf' run:" +echo "start-queue.sh mac-ews eseidel-cq-sf" +exit 1 +fi + +cd /mnt/git/webkit-$1 +while : +do + git reset --hard trunk + git clean -f + git rebase --abort + git fetch + git svn rebase + # test-webkitpy has code to remove orphaned .pyc files, so we + # run it before running webkit-patch to avoid stale .pyc files + # preventing webkit-patch from launching. + ./Tools/Scripts/test-webkitpy + ./Tools/Scripts/webkit-patch $1 --bot-id=$2 --no-confirm --exit-after-iteration 10 +done diff --git a/Tools/EWSTools/ubuntu-ews-packages b/Tools/EWSTools/ubuntu-ews-packages new file mode 100644 index 0000000..a7917a0 --- /dev/null +++ b/Tools/EWSTools/ubuntu-ews-packages @@ -0,0 +1,61 @@ +subversion +git-core +git-svn +binutils-gold +python-mechanize +libqt4-dev +gperf +bison +fakeroot +flex +g++ +g++-multilib +gperf +autoconf +automake +libapache2-mod-php5 +libasound2-dev +libbz2-dev +libicu-dev +libphonon-dev +libsqlite3-dev +libcairo2-dev +libdbus-glib-1-dev +libgconf2-dev +libgl1-mesa-dev +libglu1-mesa-dev +libglib2.0-dev +libjpeg62-dev +libnspr4-dev +libnss3-dev +libpam0g-dev +libtool +libgtk2.0-dev +libpango1.0-dev +libicu-dev +libxslt-dev +libxslt1-dev +libxss-dev +libsoup2.4-dev +libsqlite3-dev +mesa-common-dev +patch +perl +pkg-config +python +libcupsys2-dev +libgnome-keyring-dev +libcurl4-gnutls-dev +libcupsys2-dev +gperf +bison +flex +libjpeg62-dev +libpng12-dev +libxt-dev +autotools-dev +libgstreamer-plugins-base0.10-dev +libenchant-dev +libgail-dev +gtk-doc-tools +libgeoclue-dev |