#3448 vtk8itk5wx3-macos in Windows

diff --git a/Install_mingw64/Install_CreaTools/creatools.bat b/Install_mingw64/Install_CreaTools/creatools.bat
index c0d21dba6bbdf812674d46c9e7ec7023d2fc8196..6ba070acf39bf46f7e9847b0dd36283f78edd7ee 100644 (file)
--- a/Install_mingw64/Install_CreaTools/creatools.bat
+++ b/Install_mingw64/Install_CreaTools/creatools.bat
@@ -1,18 +1,17 @@
 @echo off
 
 
-set baseProject=C:\Eduardo\Creatis
-set ProgramFiles=C:\Program Files
-
-;::set baseProject=C:\Users\davila\Creatools
+::set baseProject=C:\Eduardo\Creatis
 ::set ProgramFiles=C:\Program Files
+::set cmakeBin=C:\Eduardo\Creatis\DevelopperTools\cmake-3.17.1-win64-x64\bin\cmake.exe
+
 
-::set baseProject=E:\creatis\c_mingw
-::set ProgramFiles=C:\Program Files (x86)
+set baseProject=E:\creatis\C11
+set ProgramFiles=C:\Program Files (x86)
+set cmakeBin=E:\creatis\crea_Developer_Tools\v4\cmake-3.17.1-win64-x64\bin\cmake.exe
 
 set docGeneration=OFF
-set cmakeBin=%baseProject%\DevelopperTools\cmake-3.17.1-win64-x64\bin\cmake.exe
-set creatoolsGeneration=%baseProject%\C11\ct
+set creatoolsGeneration=%baseProject%\ct
 set bash=%ProgramFiles%\Git\bin\bash.exe
 :: Some times you have to put this is comments
 :: If not in comments you need to activate de ppk key with the putty-agent

diff --git a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat
index 94c4ac5318e9c02b13cd00d5c09c00897fc17c37..bf57c4be0597c4b73dd2c865292bcda0dd033d63 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat
@@ -31,6 +31,9 @@ echo downloading creatools software
 ::goto SkipEED1
 :SkipEED1
 
+::set creatoolsBranch=vtk8itk5wx3-mingw64
+set creatoolsBranch=vtk8itk5wx3-macos
+
 
 echo echo tmp.sh > tmp.sh
 set creatoolsGeneration2=%creatoolsGeneration:\=/%
@@ -41,64 +44,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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 

diff --git a/Install_mingw64/Install_CreaTools/scripts/tmp.sh b/Install_mingw64/Install_CreaTools/scripts/tmp.sh
deleted file mode 100644 (file)
index abeb6fd..0000000
--- a/Install_mingw64/Install_CreaTools/scripts/tmp.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-echo tmp.sh 
-mkdir C:/Eduardo/Creatis/C11/ct                                                                                                                
-mkdir C:/Eduardo/Creatis/C11/ct/cs                                                                                                     
-cd C:/Eduardo/Creatis/C11/ct/cs                                                                                                        
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/crea                                         
-cd crea                                                                                                                                        
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtk                                         
-cd bbtk                                                                                                                                        
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMaracasVisu                      
-cd creaMaracasVisu                                                                                                                     
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaVtk                              
-cd creaVtk                                                                                                                             
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaEnvironment              
-cd creaEnvironment                                                                                                             
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaBruker                           
-cd creaBruker                                                                                                                          
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaImageIO                                  
-cd creaImageIO                                                                                                                         
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaContours                 
-cd creaContours                                                                                                                        
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaRigidRegistration        
-cd creaRigidRegistration                                                                                               
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtkGEditor                          
-cd bbtkGEditor                                                                                                                         
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMiniTools                        
-cd creaMiniTools                                                                                                               
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaTools                            
-cd creaTools                                                                                                                           
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          

diff --git a/Install_mingw64/Install_ThirdParty/install-All.bat b/Install_mingw64/Install_ThirdParty/install-All.bat
index 6c030bf5757f96ce5758fffc0609113b4ce96883..a02e8df33bae0c441142ab1ba02043c049e360a4 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/install-All.bat
+++ b/Install_mingw64/Install_ThirdParty/install-All.bat
@@ -1,22 +1,26 @@
 
-set thirdpartyGenerationBase=C:\Eduardo\Creatis\C11\tpl\
-
-set cmakeBin=C:\Eduardo\Creatis\DevelopperTools\cmake-3.17.1-win64-x64\bin\cmake.exe
-
-set wgetPath="C:\Eduardo\Creatis\DevelopperTools\wget-1.19.4-win32\wget.exe"
-
+:: Computer EED : Tour Cratools
+set thirdpartyGenerationBase=E:\Creatis\C11\tpl\
+set cmakeBin=E:\creatis\crea_Developer_Tools\v4\cmake-3.17.1-win64-x64\bin\cmake.exe
+set wgetPath="E:\creatis\crea_Developer_Tools\v4\wget\wget.exe"
 set zipPath="C:\Program Files\7-Zip\7z.exe"
 ::set zipPath="peazip -ext2here "
+set DirMingwDlls=E:\creatis\crea_Developer_Tools\v4\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin
 
-set DirMingwDlls=C:\Eduardo\Creatis\DevelopperTools\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin
 
-set PATH=C:\Windows\system32;C:\Eduardo\Creatis\DevelopperTools\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin;
+:: Computer EED : Portable Mac2
+::set thirdpartyGenerationBase=C:\Eduardo\Creatis\C11\tpl\
+::set cmakeBin=C:\Eduardo\Creatis\DevelopperTools\cmake-3.17.1-win64-x64\bin\cmake.exe
+::set wgetPath="C:\Eduardo\Creatis\DevelopperTools\wget-1.19.4-win32\wget.exe"
+::set zipPath="C:\Program Files\7-Zip\7z.exe"
+::  ::set zipPath="peazip -ext2here "
+::set DirMingwDlls=C:\Eduardo\Creatis\DevelopperTools\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin
 
 
-start /wait install_generate_thirdparty-x64Release.bat
 
+set PATH=C:\Windows\system32;%DirMingwDlls%; 
+start /wait install_generate_thirdparty-x64Release.bat
 ::REM start /wait install_generate_thirdparty-x64Debug.bat
 ::REM start /wait install_generate_thirdparty-x86Release.bat
 ::     REM start /wait install_generate_thirdparty-x86Debug.bat
-
-::pause
\ No newline at end of file
+::pause

diff --git a/Install_mingw64/Readme_EED.txt b/Install_mingw64/Readme_EED.txt
index 9d9baf96a11d065295d4f5bd64d46de1836305c7..add5519ce4dbf461a9c3c56bfb6b53586ee707c1 100644 (file)
--- a/Install_mingw64/Readme_EED.txt
+++ b/Install_mingw64/Readme_EED.txt
@@ -1,6 +1,7 @@
 =============================  Third Part Library  ==========================
 
 1. Install from /home/davila/public_html/creatools_back_site/crea_Developer_Tools/v4 
+       - 7z
        - mingw-64  V7.3  Version x86_64  
                Add int the sytem PATH:
                        <..InstalationPath..>\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin
@@ -9,7 +10,6 @@
        - basic-miktex-2.9.6753-x64.exe
        - nsis-3.03-setup.exe
 
-       - 7z
 
         - git Install Options
                -No GUI
@@ -22,7 +22,7 @@
         - key ssh: copy the id_rsa version 2 in <Users>\.ssh  (see mail ups rsa 2)
 
 2. Clone creaToolsTools 
-     -Cambiar la branch  (mingw64)
+     -Cambiar la branch  (vtk8itk5wx3-macos)
      -En creaToolsTools\Install_mingw64\Install_ThirdParty\install_All.bat ajustar el path de:
                        cmakeBin
                        thirdpartyGenerationBase
@@ -59,3 +59,14 @@ opcion de clean y download se renombran los source automatidacmente  (OJO con wx
    configurar bien la variable, que depende donde esta instalado git
    set bash=C:\Program Files\Git\bin\bash.exe
    
+=================================================================
+
+Changing computer configuration paths...
+
+#       modified:   Install_mingw64/Install_CreaTools/creatools.bat
+#       modified:   Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat
+#       modified:   Install_mingw64/Install_ThirdParty/install-All.bat
+#       modified:   Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat
+
+
+