summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-04-02 06:11:59 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-04-02 06:11:59 (GMT)
commitea66ff84b5eac1846afcaf80b3d24297be0dce8f (patch)
tree393ac9d97f9f0a8a7833e9a48bd1cf1be120f469 /util
parentd0a3f5029dbfd37a53af6512db63c86a4130aad3 (diff)
downloadQt-ea66ff84b5eac1846afcaf80b3d24297be0dce8f.zip
Qt-ea66ff84b5eac1846afcaf80b3d24297be0dce8f.tar.gz
Qt-ea66ff84b5eac1846afcaf80b3d24297be0dce8f.tar.bz2
Simplify WebKit import script
Don't require any arguments by default, get the repo path from git config and updated the default tag. Reviewed-by: Trust me
Diffstat (limited to 'util')
-rwxr-xr-xutil/webkit/mkdist-webkit35
1 files changed, 19 insertions, 16 deletions
diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit
index 1268b5e..0644564 100755
--- a/util/webkit/mkdist-webkit
+++ b/util/webkit/mkdist-webkit
@@ -1,7 +1,24 @@
#!/bin/bash
-repository="git://git.dev.troll.no/webkit-mirror"
-tag="qtwebkit-merged-into-qt-4-4"
+die() {
+ echo $*
+ exit 1
+}
+
+default_tag="origin/qtwebkit-4.5"
+
+if [ $# -eq 0 ]; then
+ tag="$default_tag"
+elif [ $# -eq 1 ]; then
+ tag=$1
+else
+ die "usage: $0 [commit (defaults to $default_tag)]"
+fi
+
+repository=`git config qtwebkit.url`
+if [ -z "$repository" ]; then
+ die "error: cannot locate webkit git repository. please run git config --global qtwebkit.url /path-or-url/to/webkit/repo"
+fi
excluded_directories="LayoutTests JavaScriptGlue WebKitLibraries WebKitSite WebKitTools WebCore/platform/cf WebCore/platform/gtk WebCore/platform/chromium"
excluded_directories="$excluded_directories PageLoadTests"
@@ -138,20 +155,6 @@ files_to_remove="$files_to_remove WebCore/WebCoreSources.bkl"
files_to_remove="$files_to_remove WebCore/webcore-base.bkl"
files_to_remove="$files_to_remove WebCore/webcore-wx.bkl"
-if [ $# -eq 1 ]; then
- tag=$1
-fi
-
-if [ $# -eq 2 ]; then
- repository=$1
- tag=$2
-fi
-
-die() {
- echo $*
- exit 1
-}
-
require_clean_work_tree() {
# test if working tree is dirty
git rev-parse --verify HEAD > /dev/null &&