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

[Peter Kümmel]

SVN commit 1321342 by kuemmel:

use a use a Qt5 postfix

 M  +27 -25    travis.sh  


--- branches/work/kst/portto4/kst/cmake/travis.sh #1321341:1321342
@@ -4,26 +4,25 @@
 #
 
 
+
 # ---------------------------------------------------------
 #
 # set 'versionname' to overwrite generated one based on 'ver'
 #
+
 #versionname=Kst-2.0.7-Beta1
+
 ver=2.0.7-Beta
-
-
-
-# ---------------------------------------------------------
-# 
-# helper function to check return code
-#
-checkExitCode() {
-    exitcode=$?
-    if [ $exitcode -ne 0 ]; then
-        echo Command failed
-        exit 1
+date=`date --utc '+%Y.%m.%d-%H.%M'`
+if [ -z $versionname ]; then
+    versionname=Kst-$ver-$date
     fi
-}
+if [ "$1" = "qt5" ]; then
+    versionname=$versionname-Qt5
+fi
+echo ---------------------------------------------------------
+echo ---------- Building $versionname
+echo ---------------------------------------------------------
 
 
 
@@ -32,7 +31,6 @@
 # print some info about the system
 #
 echo
-echo ----------------------------------- 
 echo Build system:
 echo
 uname -a
@@ -46,13 +44,27 @@
     sudo rm -rf /usr/lib/jvm
     df -h
 fi
-echo ----------------------------------- 
+echo ---------------------------------------------------------
 echo
 
 
 
 # ---------------------------------------------------------
 # 
+# helper function to check return code
+#
+checkExitCode() {
+    exitcode=$?
+    if [ $exitcode -ne 0 ]; then
+        echo Command failed
+        exit 1
+    fi
+}
+
+
+
+# ---------------------------------------------------------
+# 
 # get sha1 when git is used
 #
 sha1=`git rev-parse master`
@@ -179,23 +191,13 @@
 #
 # build Kst
 #
-date=`date --utc '+%Y.%m.%d-%H.%M'`
 cd $builddir
 if [ "$1" = "qt5" ]; then
-    ver=$ver-Qt5
     qtopt="-Dkst_qt5=1 -Dkst_opengl=0"
-    if [ ! -z $versionname ]; then
-        versionname=$versionname-Qt5
-    fi
 else
-    ver=$ver-Qt4
     qtopt="-Dkst_qt4=/opt/$qtver -Dkst_opengl=0"
 fi
 
-if [ -z $versionname ]; then
-    versionname=Kst-$ver-$date
-fi
-
 $cmakebin ../kst/cmake/ \
     -Dkst_release=1  \
     -Dkst_version_string=$versionname \