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

[Peter Kümmel]

SVN commit 1291029 by kuemmel:

update mingw release scripts

 M  +7 -3      INSTALL  
 M  +9 -44     misc/mingw-release-build-deps.bat  
 M  +3 -3      misc/mingw-release-download-deps.bat  


--- branches/work/kst/portto4/kst/INSTALL #1291028:1291029
@@ -105,6 +105,7 @@
 	Available options will be listed on each cmake run.
 	Here the options with their default value:
 
+	-- kst_version_string       = ON     : Version string
 	-- kst_release              = OFF    : Build release version: optimize for speed, don't embedded debug symbols
 	-- kst_merge_files          = OFF    : Merge files to speedup build about factor 5
 	-- kst_merge_rebuild        = OFF    : Rebuild generated files from merged files build
@@ -117,15 +118,16 @@
 	-- kst_pch                  = ON     : Use precompiled headers
 	-- kst_svnversion           = ON     : Use svnversion's output for Kst's version information
 	-- kst_rpath                = ON     : Use rpath
+	-- kst_3rdparty_build       = OFF    : Download and build 3rd party libraries
 	-- kst_3rdparty_download    = OFF    : Download precompiled 3rd party libraries
 	-- kst_console              = OFF    : Open console on Windows
 	-- kst_edit_cont            = OFF    : Enable "Edit and Continue" for Visual Studio
+	-- kst_python               = OFF    : Build Python suppor
 
 	To enable a option pass the value ON or 1, eg
 		cmake ../kst/cmake -Dkst_merge_files=1
 
 
-
 Using the merged files build
 -----------------------------
 
@@ -190,7 +192,9 @@
 ----------
 
 	To build a release for Windows install the "Qt SDK for Windows"
-	(it comes with MinGW) and call in a build folder
+	(it ships also MinGW) and call in the folder which contains the 
+	kst dir:
 	
-		..\kst\misc\mingw-release-download-deps
+		kst\misc\mingw-release-download-deps.bat <Kst version name>
 
+
--- branches/work/kst/portto4/kst/misc/mingw-release-build-deps.bat #1291028:1291029
@@ -1,49 +1,14 @@
-::TODO remove hardcoded paths
-:: TODO specify path for sources
-:: TODO copy cmake files to sources
 
-set KSTDEPS=e:\sandbox\kst-3rdparty-win32-deps-1.0
-rmdir /s/q %KSTDEPS%
+rmdir /s/q mingw-release-build-deps
+mkdir      mingw-release-build-deps
+cd         mingw-release-build-deps
 
-del CMakeCache.txt
-cmake e:\sandbox\kst\kst\misc\matio-windows -Dmatio_dir=e:/sandbox/matio/matio -G"CodeBlocks - MinGW Makefiles" -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%KSTDEPS%
-mingw32-make 
-mingw32-make install/strip
+cmake ..\kst\cmake -G"MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=0 -Dkst_3rdparty_build=1 -Dkst_install_prefix=Kst-%1 -Dkst_version_string=%1
 
-exit /b
+mingw32-make -j
+mingw32-make install
+mingw32-make package
+mingw32-make package_source
 
-mingw32-make install/strip
+cd ..
 
-del CMakeCache.txt
-cmake ..\kst\misc\netcdf-windows -Dnetcdf_sources=Q:/netcdf/netcdf-4.1.1/netcdf-4.1.1 -G"MinGW Makefiles" -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%KSTDEPS%
-mingw32-make install/strip
-
-
-del CMakeCache.txt
-cmake Q:\getdata\getdata\cmake -G"MinGW Makefiles" -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%KSTDEPS%
-mingw32-make install/strip
-
-
-del CMakeCache.txt
-cmake ..\kst\misc\gsl-windows Q:\gsl\gsl-1.14\gsl-1.14 -G"MinGW Makefiles" -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%KSTDEPS%
-mingw32-make install/strip
-
-del CMakeCache.txt
-cmake ..\kst\misc\cfitsio-windows -DCFIT_DIR=Q:/cfits/cfit3250 -G"MinGW Makefiles" -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%KSTDEPS% 
-mingw32-make install/strip
-
-
-set GETDATA_DIR=%KSTDEPS%
-set NETCDF_DIR=%KSTDEPS%
-set GSL_DIR=%KSTDEPS%
-set CFITSIO_DIR=%KSTDEPS%
-
-del CMakeCache.txt
-rmdir /s/q bin
-rmdir /s/q lib
-rmdir /s/q plugin
-
-cmake ..\kst\cmake -G"MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 
-
-mingw32-make
-mingw32-make install/strip
--- branches/work/kst/portto4/kst/misc/mingw-release-download-deps.bat #1291028:1291029
@@ -1,7 +1,7 @@
 
-rmdir /q/s build-mingw-release
-mkdir build-mingw-release
-cd build-mingw-release
+rmdir /s/q mingw-release-download-deps
+mkdir      mingw-release-download-deps
+cd         mingw-release-download-deps
 
 cmake ..\kst\cmake -G"MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=0 -Dkst_3rdparty_download=1 -Dkst_install_prefix=Kst-%1 -Dkst_version_string=%1