#3200creaToolsToolsFeatureNewNormal- branch mingw64

diff --git a/Install_mingw64/Install_CreaTools/scripts/tmp.sh b/Install_mingw64/Install_CreaTools/scripts/tmp.sh
index 205376a3b1990ff367c055f3070528e43c8fd4d8..c828138355f0ad1585cb11c311e8b2458500723f 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/tmp.sh
+++ b/Install_mingw64/Install_CreaTools/scripts/tmp.sh
@@ -6,6 +6,46 @@ git clone ssh://gitolite@git.creatis.insa-lyon.fr/crea
 cd crea                                                                                                                                        
 git checkout vtk7itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
+git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtk                                         
+cd bbtk                                                                                                                                        
+git checkout vtk7itk4wx3-mingw64                                                                                                       
+cd ..                                                                                                                                                          
+git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMaracasVisu                      
+cd creaMaracasVisu                                                                                                                     
+git checkout vtk7itk4wx3-mingw64                                                                                                       
+cd ..                                                                                                                                                          
+git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaVtk                              
+cd creaVtk                                                                                                                             
+git checkout vtk7itk4wx3-mingw64                                                                                                       
+cd ..                                                                                                                                                          
+git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaEnvironment              
+cd creaEnvironment                                                                                                             
+git checkout vtk7itk4wx3-mingw64                                                                                                       
+cd ..                                                                                                                                                          
+git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaBruker                           
+cd creaBruker                                                                                                                          
+git checkout vtk7itk4wx3-mingw64                                                                                                       
+cd ..                                                                                                                                                          
+git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaImageIO                                  
+cd creaImageIO                                                                                                                         
+git checkout vtk7itk4wx3-mingw64                                                                                                       
+cd ..                                                                                                                                                          
+git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaContours                 
+cd creaContours                                                                                                                        
+git checkout vtk7itk4wx3-mingw64                                                                                                       
+cd ..                                                                                                                                                          
+git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaRigidRegistration        
+cd creaRigidRegistration                                                                                               
+git checkout vtk7itk4wx3-mingw64                                                                                                       
+cd ..                                                                                                                                                          
+git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtkGEditor                          
+cd bbtkGEditor                                                                                                                         
+git checkout vtk7itk4wx3-mingw64                                                                                                       
+cd ..                                                                                                                                                          
+git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMiniTools                        
+cd creaMiniTools                                                                                                               
+git checkout vtk7itk4wx3-mingw64                                                                                                       
+cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaTools                            
 cd creaTools                                                                                                                           
 git checkout vtk7itk4wx3-mingw64                                                                                                       

diff --git a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
index 978cd71b00767dd74f700277d97fc5f34dcfa551..e96c1b01a637e13ca8e028e0f71cb355a5300fe5 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
@@ -54,8 +54,8 @@ set QTFNAME=qt-everywhere-opensource-src-4.8.2.zip
 set ITKFNAME=InsightToolkit-4.12.1.tar
 ::set WXFNAME=wxWidgets-2.8.12.zip
 ::set WXVERSION=2.8.12
-set WXFNAME=wxWidgets-3.1.1.7z
-set WXVERSION=3.1.1
+set WXFNAME=wxWidgets-3.0.4.7z
+set WXVERSION=3.0.4
 :: set BOOSTFNAME=boost_1_49_0.7z
 :: set BOOSTFNAME=boost_1_52_0.7z
 set BOOSTFNAME=boost_1_64_0.7z

diff --git a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 3c20e764481cbda3805d4afaec16b972772ce86b..d0ff9fc37fefede9809beb74d683653f466f480a 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -133,13 +133,30 @@ cd %wxWidgets%Bin
 ::     )
 ::)
 ::cd C:\
-
-%cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%wxWidgets% -B%binpath%\%wxWidgets%Bin                                           >> %LogFolder%\wxWidgetsInstall.log 2>&1
-%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt                   >> %LogFolder%\wxWidgetsInstall.log 2>&1
 ::cmake -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt                >> %LogFolder%\wxWidgetsInstall.log 2>&1
 ::cmake -D VTK_Group_Views:BOOL=ON CMakeCache.txt                                                                       >> %LogFolder%\wxWidgetsInstall.log 2>&1
-mingw32-make.exe -j%NUMBER_OF_PROCESSORS%                                                                                      >> %LogFolder%\wxWidgetsInstall.log 2>&1
-mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install                                                                              >> %LogFolder%\wxWidgetsInstall.log 2>&1
+
+:: 3.1.1 with CMAKE
+::%cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%wxWidgets% -B%binpath%\%wxWidgets%Bin                                  >> %LogFolder%\wxWidgetsInstall.log 2>&1
+::%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt                         >> %LogFolder%\wxWidgetsInstall.log 2>&1
+::mingw32-make.exe -j%NUMBER_OF_PROCESSORS%                                                                             >> %LogFolder%\wxWidgetsInstall.log 2>&1
+::mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install                                                                     >> %LogFolder%\wxWidgetsInstall.log 2>&1
+
+:: 3.0.4 manual
+:: https://wiki.wxwidgets.org/Compiling_wxWidgets_with_MinGW
+cd %sourcepath%\%wxWidgets%\build\msw                                              
+mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release clean                                    >> %LogFolder%\wxWidgetsInstall.log 2>&1
+mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release -j%NUMBER_OF_PROCESSORS%      >> %LogFolder%\wxWidgetsInstall.log 2>&1
+mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release -j%NUMBER_OF_PROCESSORS%      >> %LogFolder%\wxWidgetsInstall.log 2>&1
+mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release                                                  >> %LogFolder%\wxWidgetsInstall.log 2>&1
+cd ..\..                                                                           
+mkdir %installpath%                                                                                    >> %LogFolder%\wxWidgetsInstall.log 2>&1
+mkdir %installpath%\lib                                                                                >> %LogFolder%\wxWidgetsInstall.log 2>&1
+mkdir %installpath%\lib\gcc_dll                                                                        >> %LogFolder%\wxWidgetsInstall.log 2>&1
+xcopy /Y /S lib\gcc_dll  %installpath%\lib\gcc_dll                                                     >> %LogFolder%\wxWidgetsInstall.log 2>&1
+mkdir %installpath%\include                                                                            >> %LogFolder%\wxWidgetsInstall.log 2>&1
+mkdir %installpath%\include\wx                                                                         >> %LogFolder%\wxWidgetsInstall.log 2>&1
+xcopy /Y /S include\wx  %installpath%\include\wx                                                       >> %LogFolder%\wxWidgetsInstall.log 2>&1
 
 
 :SKIPINSTALLWXWIDGETS

diff --git a/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat
index bcc71b5ed2af9ec0ea5a450bed3f8278749c690e..79d4daeef0c9a635053ea13ddad0faaf83a73831 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat
@@ -7,15 +7,15 @@ set  EEDcleanLOGS=TRUE
 
 set  EEDdownload=TRUE
 set  EEDdownloadQT=FALSE
-set  EEDdownloadITK=TRUE
 set  EEDdownloadWXWINDOWS=TRUE
 set  EEDdownloadBOOST=TRUE
-set  EEDdownloadXERCES=TRUE
 set  EEDdownloadVTK=TRUE
 set  EEDdownloadGDCM=TRUE
-set  EEDdownloadTTH=TRUE
+set  EEDdownloadITK=TRUE
+set  EEDdownloadXERCES=TRUE
 set  EEDdownloadSQLite=TRUE
 set  EEDdownloadDLFCN=TRUE
+set  EEDdownloadTTH=TRUE
 set  EEDdownloadOPENGLMESA=TRUE
 
 set  EEDinstall=TRUE