[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/gpg4win/scripts/debian-xcompile
From:       Andre Heinecke <aheinecke () intevation ! de>
Date:       2013-04-17 9:51:51
Message-ID: 20130417095151.9BE2FAC87A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1349869 by aheinecke:

Add checksha1 function, update qt and set default build type to release


 M  +2 -1      02-update-qt.sh  
 M  +6 -5      config  
 M  +8 -0      functions  


--- branches/work/gpg4win/scripts/debian-xcompile/02-update-qt.sh #1349868:1349869
@@ -14,12 +14,13 @@
 if [ ! -d "$QT_SRC" ] ; then
     DIR="$(dirname "$QT_SRC")"
     cd "$DIR" || die "Cannot change into $DIR"
-    run "Downloading Qt (100M+, might take a while)" wget -N "$QT_WEB"
+    run "Downloading Qt (250M+, might take a while)" wget -N "$QT_WEB"
     case "$QT_LOCAL" in
         *.bz2) UNZIP=j;;
         *.gz)  UNZIP=z ;;
         *)     die "Cannot detect compression used to pack $QT_LOCAL" ;;
     esac
+    checksha1 $QT_LOCAL $QT_SHA1
     run "Unpacking $QT_LOCAL -> $QT_BASENAME" tar xf${UNZIP}v "$QT_LOCAL"
     cd - >/dev/null 2>&1 || die "Cannot change back from $SRCDIR to $OLDPWD"
 fi
--- branches/work/gpg4win/scripts/debian-xcompile/config #1349868:1349869
@@ -106,10 +106,11 @@
 readonly STAGE2_BUILD="$BUILDDIR/gpg4win-final"
 
 # Qt settings
-readonly QT_VERSION=4.4.3
-readonly QT_BASENAME=qt-all-opensource-src-$QT_VERSION
-readonly QT_LOCAL=$QT_BASENAME.tar.bz2
-readonly QT_WEB=ftp://ftp.trolltech.no/qt/source/$QT_LOCAL
+readonly QT_VERSION=4.8.4
+readonly QT_SHA1=f5880f11c139d7d8d01ecb8d874535f7d9553198
+readonly QT_BASENAME=qt-everywhere-opensource-src-$QT_VERSION
+readonly QT_LOCAL=$QT_BASENAME.tar.gz
+readonly QT_WEB=http://releases.qt-project.org/qt4/source/$QT_LOCAL
 readonly QT_NATIVE_FLAGS="-fast -shared -release"
 readonly QT_NATIVE_EXCLUDE="exceptions accessibility stl sql-ibase sql-mysql \
sql-odbc sql-psql sql-sqlite sql-sqlite2 qt3support xmlpatterns phonon phonon-backend \
webkit gif libtiff libmng nis cups iconv separate-debug-info nas-sound opengl \
xinerama xcursor xfixes xrandr xrender fontconfig tablet xkb glib"  readonly \
QT_NATIVE_SYSTEM="libjpeg zlib libpng" @@ -123,7 +124,7 @@
 
 readonly KDEGIT=git@git.kde.org
 
-readonly KDE_BUILD_TYPE=debugfull # Debug Release
+readonly KDE_BUILD_TYPE=Release #debugfull # Debug Release
 
 readonly KDE_SRC_ZIP="zip -r"
 readonly KDE_SRC_SUFFIX=-src.zip
--- branches/work/gpg4win/scripts/debian-xcompile/functions #1349868:1349869
@@ -148,3 +148,11 @@
 
     
 }
+
+checksha1() {
+    sha1sum=`openssl sha1 $1 | awk \{'print $2'\}`
+    if [ $sha1sum == $2 ]; then
+        return 0
+    fi;
+    die "Bad SHA1SUM for $1"
+}


[prev in list] [next in list] [prev in thread] [next in thread]