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

[Peter Kümmel]

SVN commit 1333807 by kuemmel:

build also 32bit version

 M  +1 -1      .travis.yml  
 M  +9 -0      cmake/misc/CMakeLists.txt  
 M  +23 -11    cmake/travis.sh  


--- branches/work/kst/portto4/kst/.travis.yml #1333806:1333807
@@ -13,8 +13,8 @@
  - sudo apt-get autoremove
 
 script:
-# - ./cmake/travis.sh qt4
  - ./cmake/travis.sh qt5
+ - ./cmake/travis.sh qt5 x64
 
 branches:
  only:
--- branches/work/kst/portto4/kst/cmake/misc/CMakeLists.txt #1333806:1333807
@@ -16,6 +16,15 @@
 			${QT_BINARY_DIR}/../plugins/platforms/qwindows.dll			
 			DESTINATION bin/platforms
 			CONFIGURATIONS Release)
+		install(FILES
+			${QT_BINARY_DIR}/../plugins/printsupport/windowsprintersupport.dll		
+			DESTINATION bin/printsupport
+			CONFIGURATIONS Release)
+		install(FILES
+			${QT_BINARY_DIR}/../plugins/imageformats/qgif.dll
+			${QT_BINARY_DIR}/../plugins/imageformats/qjpeg.dll				
+			DESTINATION bin/imageformats
+			CONFIGURATIONS Release)
 	else()
 		install(FILES
 			${QT_BINARY_DIR}/QtCore4.dll
--- branches/work/kst/portto4/kst/cmake/travis.sh #1333806:1333807
@@ -73,6 +73,7 @@
     checkExitCode
     
     cd $startdir
+    git config --global push.default matching
     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
@@ -136,25 +137,36 @@
 $cmakebin --version
 checkExitCode
 
+gccver=4.7.2
+if [ "$2" = "x64" ]; then
 mingw=x86_64-w64-mingw32
+    exc=-seh
+	mingwdir=mingw64$exc
+	branch=Kst-64bit
+    extlib=
+    useext=
+else
+	mingw=i686-w64-mingw32
+	exc=-dw2
+	mingwdir=mingw32$exc
+	branch=Kst-32bit
+    extlib=
+    useext=
+fi
+
 if [ "$1" = "qt5" ]; then
     qtver=5.0.1
     tarver=
-    gccver=4.7.2
-    exc=-seh # or -dw2
-    extlib=
-    useext=
 else
     qtver=4.8.4
     tarver=
-    gccver=4.7.2
-    exc=-dw2
-    extlib=kst-3rdparty-win32-gcc-$exc-4.7.2
+    branch=Kst-32bit-Qt4
+    extlib=kst-3rdparty-win32-gcc$exc-4.7.2
     useext="-Dkst_3rdparty=1 -Dkst_3rdparty_dir=/opt/"$extlib
 fi
+
 qtver=Qt-$qtver-win32-g++-$mingw$exc-$gccver
-mingwver=x86_64-w64-mingw32-gcc$exc-$gccver
-mingwdir=mingw64$exc
+mingwver=$mingw-gcc$exc-$gccver
 
 
 server=http://sourceforge.net/projects/kst/files/3rdparty
@@ -175,7 +187,7 @@
 # when cross-compiler is in path cmake assumes it is a native compiler and passes "-rdynamic" which mingw doesn't support
 #export PATH=/opt/mingw32/bin:$PATH
 echo Checking mingw installation ...
-/opt/$mingwdir/bin/x86_64-w64-mingw32-gcc -dumpversion
+/opt/$mingwdir/bin/$mingw-gcc -dumpversion
 checkExitCode
 
 
@@ -257,7 +269,7 @@
 if [ "$iam" = "$travis" ]; then
     cd $startdir/kstbinary
     if [ "$1" = "qt5" ]; then
-        git checkout Qt5
+        git checkout $branch
     else 
         git checkout master
     fi