#3224 creaToolsTools Feature New Normal - vtk8itk4wx3-mingw64

diff --git a/Install_mingw64/Install_CreaTools/creatools.bat b/Install_mingw64/Install_CreaTools/creatools.bat
index 4f327618813b33e2eca67b91a577f70904127faf..8ae283bec8a5f627bb8b4adf5ee29a3fc60d5c14 100644 (file)
--- a/Install_mingw64/Install_CreaTools/creatools.bat
+++ b/Install_mingw64/Install_CreaTools/creatools.bat
@@ -1,7 +1,7 @@
 @echo off
 
 
-set baseProject=C:\Users\davila\Creatools
+set baseProject=C:\Users\davila\Creatools-7
 set ProgramFiles=C:\Program Files
 ::set baseProject=E:\creatis\c_mingw
 ::set ProgramFiles=C:\Program Files (x86)

diff --git a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat
index c1ed5a7bbfe8401df29290d3a6527cf99a424f29..d2fc6835b8dcfbee6d67e1338b5886719b3bdc27 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat
@@ -41,64 +41,64 @@ echo cd %creatoolsGeneration2%/cs                                                                                                           >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creasource%                                    >> tmp.sh
 echo cd %creasource%                                                                                                                                           >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtksource%                                    >> tmp.sh
 echo cd %bbtksource%                                                                                                                                           >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creamaracassource%                     >> tmp.sh
 echo cd %creamaracassource%                                                                                                                    >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creavtksource%                                 >> tmp.sh
 echo cd %creavtksource%                                                                                                                                >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaenvironmentsource%                 >> tmp.sh
 echo cd %creaenvironmentsource%                                                                                                                >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creabrukersource%                              >> tmp.sh
 echo cd %creabrukersource%                                                                                                                     >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaimagesource%                               >> tmp.sh
 echo cd %creaimagesource%                                                                                                                      >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creacontourssource%            >> tmp.sh
 echo cd %creacontourssource%                                                                                                                           >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%crearigidregistrationssource%          >> tmp.sh
 echo cd %crearigidregistrationssource%                                                                                                 >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtkgeditorsource%                     >> tmp.sh
 echo cd %bbtkgeditorsource%                                                                                                                    >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaminitoolssource%                   >> tmp.sh
 echo cd %creaminitoolssource%                                                                                                                  >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creatoolssource%                               >> tmp.sh
 echo cd %creatoolssource%                                                                                                                      >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 

diff --git a/Install_mingw64/Install_CreaTools/scripts/tmp.sh b/Install_mingw64/Install_CreaTools/scripts/tmp.sh
index 0dce247c677b146c73a19a69b242195bc35dd688..4a29339e1581f79f2c2c12a5e2bb0742643063d3 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/tmp.sh
+++ b/Install_mingw64/Install_CreaTools/scripts/tmp.sh
@@ -1,7 +1,7 @@
 echo tmp.sh 
-mkdir C:/Users/davila/Creatools/C5/ct                                                                                                          
-mkdir C:/Users/davila/Creatools/C5/ct/cs                                                                                                       
-cd C:/Users/davila/Creatools/C5/ct/cs                                                                                                          
+mkdir C:/Users/davila/Creatools-7/C5/ct                                                                                                                
+mkdir C:/Users/davila/Creatools-7/C5/ct/cs                                                                                                     
+cd C:/Users/davila/Creatools-7/C5/ct/cs                                                                                                        
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/crea                                         
 cd crea                                                                                                                                        
 git checkout vtk7itk4wx3-mingw64                                                                                                       

diff --git a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt
index 885e9c819ffc4bd3ce90fc7cfe57974a3da04826..b753986073c865dffb3a319a0fa42f8e8cd66d28 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt
+++ b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt
@@ -21,7 +21,7 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION})
 
 
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CREATIS\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
  IF(WIN32)
    SET(CMAKE_INSTALL_PREFIX C:/CreaTools/crea_dlls_extern)
  ENDIF(WIN32)