diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:45:28 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:45:28 (GMT) |
| commit | 8821284ac4e55caf5fe712fca002e79220e9cf7e (patch) | |
| tree | b1d82e77ee04ee50b24298ae58f46c0980ec0e5d /util/webkit | |
| parent | 2c5b7fe040575aa2ee560117c1c3455724c2f9ae (diff) | |
| parent | 13f703741dee67adc7d92e4bcf525431334c9a60 (diff) | |
| download | Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.zip Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.tar.gz Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'util/webkit')
| -rwxr-xr-x | util/webkit/mkdist-webkit | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit index 1268b5e..c26fdc1 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 && @@ -182,7 +185,7 @@ fi rev=`git ls-remote $repository | grep -E "^.+$tag$" | awk '{print $1}'` -tarball=`mktemp /tmp/webkit-snapshot.tar` || exit 1 +tarball=`mktemp /tmp/webkit-snapshot.tar.XXXXXX` || exit 1 echo "creating $tarball" echo "archiving webkit from $repository $tag ( $rev )" @@ -251,7 +254,7 @@ echo "generating extra sources" mkdir tmp && cd tmp && mkdir -p ../generated && - qmake -o Makefile QT_CONFIG+=phonon GENERATED_SOURCES_DIR=`pwd`/../generated OUTPUT_DIR=`pwd` ../$proj.pro && + qmake -o Makefile CONFIG-=QTDIR_build QT_CONFIG+=phonon GENERATED_SOURCES_DIR=`pwd`/../generated OUTPUT_DIR=`pwd` ../$proj.pro && make generated_files && perl -pi -e "s,$absSrcDir/,,g" ../generated/*.cpp ../generated/*.h && git add ../generated && |