[Kst] branches/work/kst/portto4/kst/cmake

[Peter Kümmel]

SVN commit 1321748 by kuemmel:

first try to checkout binary

because it often fails, also try it again then.

 M  +26 -16    travis.sh  


--- branches/work/kst/portto4/kst/cmake/travis.sh #1321747:1321748
@@ -2,9 +2,9 @@
 #
 #set -x
 #
+startdir=$PWD
 
 
-
 # ---------------------------------------------------------
 #
 # set 'versionname' to overwrite generated one based on 'ver'
@@ -65,6 +65,29 @@
 
 # ---------------------------------------------------------
 # 
+# checkout kstbinary
+#
+if [ "$iam" = "$travis" ]; then
+    cd ~
+    tar xf $startdir/cmake/kstdeploy.tar.gz
+    checkExitCode
+    
+    cd $startdir
+    git config --global user.name "travis"
+    git config --global user.email travis at noreply.org
+    git clone --quiet git at github.com:syntheticpp/kstbinary.git
+    exitcode=$?
+    if [ $exitcode -ne 0 ]; then
+        rm -rf kstbinary
+        git clone --quiet git at github.com:syntheticpp/kstbinary.git
+    fi
+    checkExitCode
+fi
+
+
+
+# ---------------------------------------------------------
+# 
 # get sha1 when git is used
 #
 sha1=`git rev-parse master`
@@ -80,7 +103,6 @@
 #
 # make build directory
 #
-startdir=$PWD
 cd ..
 build=_b
 if [ -d "$build" ]; then
@@ -224,26 +246,14 @@
 fi
 
 if [ "$iam" = "$travis" ]; then
-    cd ~
-    tar xf $startdir/cmake/kstdeploy.tar.gz
-    checkExitCode
-    cd $builddir
-fi
-
-
-if [ "$iam" = "$travis" ]; then
-    git config --global user.name "travis"
-    git config --global user.email travis at noreply.org
-
-    git clone --quiet git at github.com:syntheticpp/kstbinary.git
-    cd kstbinary
+    cd $startdir/kstbinary
     if [ "$1" = "qt5" ]; then
         git checkout Qt5
     else 
         git checkout master
     fi
     git reset --hard HEAD^
-    cp -f ../$versionname-win32.zip .
+    cp -f $builddir/$versionname-win32.zip .
     git add $versionname-win32.zip
     checkExitCode