3200 creaToolsTools Feature New Normal branch mingw64

diff --git a/Install_mingw64/Install_ThirdParty/install-All.bat b/Install_mingw64/Install_ThirdParty/install-All.bat
index 4050de955b7474ef9715b3edbcd6ca83bd570795..1284dc994be3208bcfcccb39edcdbaf0dd18ac6f 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/install-All.bat
+++ b/Install_mingw64/Install_ThirdParty/install-All.bat
@@ -1,9 +1,9 @@
 
-set thirdpartyGenerationBase=E:\creatis\CreaTools_minwg64\C5\tpl\
+set thirdpartyGenerationBase=E:\creatis\c_mingw\C5\tpl\
 
-set cmakeBin=E:\creatis\CreaTools_minwg64\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe
+set cmakeBin=E:\creatis\c_mingw\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe
 
-set wgetPath="E:\creatis\CreaTools_minwg64\For_mingw64\DeveloperTools\wget-1.19.4-win32\wget.exe"
+set wgetPath="E:\creatis\c_mingw\For_mingw64\DeveloperTools\wget-1.19.4-win32\wget.exe"
 
 set zipPath="C:\Program Files\7-Zip\7z.exe"
 ::set zipPath="peazip -ext2here "

diff --git a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
index cf724941c01cc7ea9159cf47de2bdb384285b0e3..ba3e2bc81bf755e9d558a727fb3d53e0722868b6 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
@@ -58,7 +58,7 @@ set WXFNAME=wxWidgets-3.1.1.7z
 set WXVERSION=3.1.1
 :: set BOOSTFNAME=boost_1_49_0.7z
 :: set BOOSTFNAME=boost_1_52_0.7z
-set BOOSTFNAME=boost_1_63_0.7z
+set BOOSTFNAME=boost_1_64_0.7z
 ::set XERCESFNAME=xerces-c-3.1.1.zip
 ::set XERCESFNAME=xerces-c-3.1.4.zip
 set XERCESFNAME=xerces-c-3.2.1.zip
@@ -223,7 +223,7 @@ echo -----------------------------------
 cd %sourcepath%
 rename qt-everywhere-opensource-src-4.8.2 qt
 rename wxWidgets_%WXVERSION% wxWidgets
-rename boost_1_63_0 boost
+rename boost_1_64_0 boost
 rename InsightToolkit-4.12.1 itk
 rename VTK-8.1.1 vtk
 rename gdcm13_2018_05_28_vtk8 gdcm13

diff --git a/Install_mingw64/Install_ThirdParty/scripts/makeAll.bat b/Install_mingw64/Install_ThirdParty/scripts/makeAll.bat
index 9a39b186eb39379388f5a6d7700dfcaa20a58f38..36427b1af5d9af278eb97f5165707f6b298199f4 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/makeAll.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/makeAll.bat
@@ -37,20 +37,20 @@ call download_ThirdPartySW.bat %thirdpartyGeneration% %buildType% %wxStable% >>
 if %EEDinstall%==FALSE GOTO SKIPINSTALL
 cd %scripts%
 echo Calling install_thirdparty.bat
-start /B /wait install_thirdparty_all.bat %thirdpartyGeneration% %buildType% %forcex86%
+call install_thirdparty_all.bat %thirdpartyGeneration% %buildType% %forcex86%
 :SKIPINSTALL
 
 if %EEDinstallerDLL%==FALSE GOTO SKIPINSTALLERDLL
 echo Calling generateThirdPartydllsExe.bat
 cd %scripts%
-start /B /wait generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType% %forcex86%
+call generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType% %forcex86%
 :SKIPINSTALLERDLL
 
 
 if %EEDinstallerLibraries%==FALSE GOTO SKIPINSTALLERLIBRARIES
 echo Calling generateThirdPartyLibExe.bat
 cd %scripts%
-start /B /wait generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType% %forcex86%
+call generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType% %forcex86%
 :SKIPINSTALLERLIBRARIES