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

[Peter Kümmel]

SVN commit 1322066 by kuemmel:

update mingw build scripts

 M  +6 -9      mingw-release-build-deps.bat  
 M  +35 -7     mingw-release-download-deps.bat  


--- branches/work/kst/portto4/kst/cmake/mingw-release-build-deps.bat #1322065:1322066
@@ -16,13 +16,10 @@
 	set make=%2
 )
 
-echo cmake ..\kst\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_build=1 -Dkst_install_prefix=Kst-%ver% -Dkst_version_string=%ver% -Dkst_make_program=%make%
+if "%3" == "" (
+	set kstdir=..\kst
+) else (
+	set kstdir=%3
+)
 
-cmake ..\kst\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=0 -Dkst_3rdparty_build=1 -Dkst_install_prefix=Kst-%ver% -Dkst_version_string=%ver% -Dkst_make_program=%make%
-
-%make%
-%make% install/strip
-%make% package
-%make% package_source
-
-cd ..
+%kstdir%\cmake\mingw-release-download-deps.bat %ver% %make% %kstdir% build
--- branches/work/kst/portto4/kst/cmake/mingw-release-download-deps.bat #1322065:1322066
@@ -1,15 +1,43 @@
+echo off
 
+if "%1" == "" (
+	set ver=2.0.x
+) else (
+	set ver=%1
+)
+
+if "%2" == "" (
+	set make=mingw32-make
+) else (
+	set make=%2
+)
+
+if "%3" == "" (
+	set kstdir=..\kst
+) else (
+	set kstdir=%3
+)
+
+if "%4" == "" (
+	set download=1
+	set build=0
 rmdir /s/q mingw-release-download-deps
 mkdir      mingw-release-download-deps
 cd         mingw-release-download-deps
+) else (
+	set download=0
+	set build=1
+)
 
-::cmake ..\kst\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_download=1 -Dkst_install_prefix=Kst-%1 -Dkst_version_string=%1
-cmake ..\kst\cmake -GNinja -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_download=1 -Dkst_install_prefix=Kst-%1 -Dkst_version_string=%1
 
-ninja 
-ninja install/strip
-ninja package
-ninja package_source
+echo on
 
+cmake %kstdir%\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=0 -Dkst_3rdparty_download=%download% -Dkst_3rdparty_build=%build%  -Dkst_install_prefix=Kst-%ver% -Dkst_version_string=%ver% -Dkst_make_program=%make%
+
+%make%
+
+mingw32-make install/strip
+mingw32-make package
+mingw32-make package_source
+
 cd ..
-