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

[Peter Kümmel]

SVN commit 1333221 by kuemmel:

build server is now 64bit, Qt5 released

 M  +2 -1      .travis.yml  
 M  +1 -1      cmake/CMakeLists.txt  
 M  +9 -7      cmake/misc/CMakeLists.txt  
 M  +22 -18    cmake/travis.sh  


--- branches/work/kst/portto4/kst/.travis.yml #1333220:1333221
@@ -9,10 +9,11 @@
 install:
  - sudo apt-get remove cmake mingw32-binutils mingw32-runtime mingw32 libqt4-dev qt4-qmake mingw-w64 g++-mingw-w64 gcc-mingw-w64
  - sudo apt-get install m4 bison flex
+ - sudo apt-get install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 # cmake is 32bit
  - sudo apt-get autoremove
 
 script:
- - ./cmake/travis.sh qt4
+# - ./cmake/travis.sh qt4
  - ./cmake/travis.sh qt5
 
 branches:
--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1333220:1333221
@@ -261,7 +261,7 @@
 	endmacro()
 	if(MSVC)
 		link_large_address(/LARGEADDRESSAWARE)
-	else()
+	elseif(NOT kst_cross) # TODO check for x86_64
 		link_large_address(-Wl,--large-address-aware)
 	endif()
 endif()
--- branches/work/kst/portto4/kst/cmake/misc/CMakeLists.txt #1333220:1333221
@@ -3,17 +3,17 @@
 if(WIN32)
 	if (kst_qt5)
 		install(FILES
-			${QT_BINARY_DIR}/QtCore5.dll
-			${QT_BINARY_DIR}/QtGui5.dll
-			${QT_BINARY_DIR}/QtWidgets5.dll
-			${QT_BINARY_DIR}/QtXml5.dll
-			${QT_BINARY_DIR}/QtNetwork5.dll				
-			${QT_BINARY_DIR}/QtPrintSupport5.dll
+			${QT_BINARY_DIR}/Qt5Core.dll
+			${QT_BINARY_DIR}/Qt5Gui.dll
+			${QT_BINARY_DIR}/Qt5Widgets.dll
+			${QT_BINARY_DIR}/Qt5Xml.dll
+			${QT_BINARY_DIR}/Qt5Network.dll				
+			${QT_BINARY_DIR}/Qt5PrintSupport.dll
 			DESTINATION bin
 			CONFIGURATIONS Release)
 		install(FILES
 			${QT_BINARY_DIR}/../plugins/platforms/qminimal.dll
-			${QT_BINARY_DIR}/../plugins/platforms/windows.dll			
+			${QT_BINARY_DIR}/../plugins/platforms/qwindows.dll			
 			DESTINATION bin/platforms
 			CONFIGURATIONS Release)
 	else()
@@ -47,6 +47,8 @@
 	endif()
 	if(EXISTS ${MINGW_BIN_PATH}/libgcc_s_sjlj-1.dll)
 		list(APPEND runtime ${MINGW_BIN_PATH}/libgcc_s_sjlj-1.dll)
+	elseif(EXISTS ${MINGW_BIN_PATH}/libgcc_s_seh-1.dll)
+		list(APPEND runtime ${MINGW_BIN_PATH}/libgcc_s_seh-1.dll)
 	elseif(EXISTS ${MINGW_BIN_PATH}/libgcc_s_dw2-1.dll)
 		list(APPEND runtime ${MINGW_BIN_PATH}/libgcc_s_dw2-1.dll)
 	endif()
--- branches/work/kst/portto4/kst/cmake/travis.sh #1333220:1333221
@@ -119,49 +119,52 @@
 #
 # get actual cmake 
 #
-cmakever=cmake-2.8.9-Linux-i386
+cmakever=cmake-2.8.10.2-Linux-i386
+
+if [ ! -d /opt/$cmakever ]; then
 cmakebin=x
 if [ ! -d /opt/$cmakever ]; then
     wget http://www.cmake.org/files/v2.8/$cmakever.tar.gz
     checkExitCode
     cd /opt
-    sudo tar xf $builddir/cmake-2.8.9-Linux-i386.tar.gz
+		sudo tar xf $builddir/$cmakever.tar.gz
     checkExitCode
     cd $builddir
 fi
+fi
 cmakebin=/opt/$cmakever/bin/cmake
 $cmakebin --version
 checkExitCode
 
-mingw=i686-w64-mingw32
+mingw=x86_64-w64-mingw32
 if [ "$1" = "qt5" ]; then
-    qtver=5.0.0
-    tarver=-3
+    qtver=5.0.1
+    tarver=
     gccver=4.7.2
-    dw2=-dw2
+    exc=-seh # or -dw2
     extlib=
     useext=
 else
     qtver=4.8.4
     tarver=
     gccver=4.7.2
-    dw2=-dw2
-    extlib=kst-3rdparty-win32-gcc-dw2-4.7.2
+    exc=-dw2
+    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$dw2-$gccver
-mingwver=i686-w64-mingw32-gcc$dw2-$gccver
-mingwdir=mingw32$dw2
+qtver=Qt-$qtver-win32-g++-$mingw$exc-$gccver
+mingwver=x86_64-w64-mingw32-gcc$exc-$gccver
+mingwdir=mingw64$exc
 
 
-
+server=http://sourceforge.net/projects/kst/files/3rdparty
 # ---------------------------------------------------------
 #
 # download and install mingw
 #
 if [ ! -d /opt/$mingwdir ]; then
-    mingwtar=$mingwver-release-linux32_rubenvb-Ubuntu32-12.04.tar
-    wget https://github.com/downloads/syntheticpp/kst/$mingwtar.xz
+    mingwtar=$mingwver-Ubuntu64-12.04.tar
+    wget $server/$mingwtar.xz
     checkExitCode
     xz -d $mingwtar.xz
     cd /opt
@@ -172,7 +175,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/i686-w64-mingw32-gcc -dumpversion
+/opt/$mingwdir/bin/x86_64-w64-mingw32-gcc -dumpversion
 checkExitCode
 
 
@@ -182,8 +185,8 @@
 # download and install Qt
 #
 if [ ! -d /opt/$qtver ]; then
-    qttar=$qtver-Ubuntu32-12.04$tarver.tar
-    wget https://github.com/downloads/syntheticpp/kst/$qttar.xz
+    qttar=$qtver-Ubuntu64-12.04$tarver.tar
+    wget $server/$qttar.xz
     checkExitCode
     xz -d $qttar.xz
     cd /opt
@@ -203,7 +206,7 @@
 # download 3rdparty
 #
 if [ ! -d /opt/$extlib ]; then
-    wget https://github.com/downloads/syntheticpp/kst/$extlib.zip
+    wget $server/$extlib.zip
     checkExitCode
     cd /opt
     sudo unzip -q $builddir/$extlib.zip
@@ -234,6 +237,7 @@
 
 checkExitCode
 
+processors=4 # /proc reports 32
 make -j $processors
 checkExitCode