]> Creatis software - creaToolsTools.git/commitdiff
#3200 creaToolsTools Feature New Normal - branch mingw64
authorEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Thu, 16 Apr 2020 08:16:26 +0000 (10:16 +0200)
committerEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Thu, 16 Apr 2020 08:16:26 +0000 (10:16 +0200)
Install_mingw64/Install_CreaTools/creatools.bat
Install_mingw64/Install_CreaTools/scripts/tmp.sh
Install_mingw64/Install_ThirdParty/install-All.bat
Install_mingw64/Install_ThirdParty/install_generate_thirdparty-x64Release.bat
Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
Install_mingw64/Readme_EED.txt

index 4f327618813b33e2eca67b91a577f70904127faf..c5e873940c0453cfbf3116647162115d3f608c57 100644 (file)
@@ -1,8 +1,12 @@
 @echo off
 
 
-set baseProject=C:\Users\davila\Creatools
-set ProgramFiles=C:\Program Files
+set baseProject=C:\Eduardo\Creatis
+set ProgramFiles=C:\Program Files (x86)
+
+;::set baseProject=C:\Users\davila\Creatools
+::set ProgramFiles=C:\Program Files
+
 ::set baseProject=E:\creatis\c_mingw
 ::set ProgramFiles=C:\Program Files (x86)
 
@@ -10,16 +14,16 @@ set ProgramFiles=C:\Program Files
 
 
 set docGeneration=OFF
-set cmakeBin=%baseProject%\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe
-set creatoolsGeneration=%baseProject%\C5\ct
+set cmakeBin=%baseProject%\DevelopperTools\cmake-3.11.2-win64-x64\bin\cmake.exe
+set creatoolsGeneration=%baseProject%\C10\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
-set GIT_SSH=%ProgramFiles%\PuTTY\plink.exe
+:: set GIT_SSH=%ProgramFiles%\PuTTY\plink.exe  
 
 cd scripts
 call All.bat %creatoolsGeneration% %docGeneration% 
-cd ..
+cd ..          
 pause
 exit
 
index 0dce247c677b146c73a19a69b242195bc35dd688..e17e65ebc8409f14a4e4827c231f8b79dc29257c 100644 (file)
@@ -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:/Eduardo/Creatis/C10/ct                                                                                                                
+mkdir C:/Eduardo/Creatis/C10/ct/cs                                                                                                     
+cd C:/Eduardo/Creatis/C10/ct/cs                                                                                                        
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/crea                                         
 cd crea                                                                                                                                        
 git checkout vtk7itk4wx3-mingw64                                                                                                       
index a0439608a654295fb8f26466a741340b6822874b..cdcf484e4fa0f7efa7e7bd50c1ece3d111be4375 100644 (file)
@@ -1,18 +1,22 @@
 
-set thirdpartyGenerationBase=E:\creatis\c_mingw\C5\tpl\
+set thirdpartyGenerationBase=C:\Eduardo\Creatis\C10\tpl\
 
-set cmakeBin=E:\creatis\c_mingw\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe
+set cmakeBin=C:\Eduardo\Creatis\DevelopperTools\cmake-3.11.2-win64-x64\bin\cmake.exe
 
-set wgetPath="E:\creatis\c_mingw\For_mingw64\DeveloperTools\wget-1.19.4-win32\wget.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=E:\creatis\c_mingw\For_mingw64\DeveloperTools\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;
+
 
 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
+::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
index 6e5f918093ef4b0a61f7160baa416fed14b5c86a..e5c2bd4d1c98835c32cc2d4ccc7014ad864bb187 100644 (file)
@@ -1,6 +1,5 @@
 
-
-@echo off
+::@echo off
 
 echo -----------------------------------
 echo ---Setting Environment Variables---
@@ -16,6 +15,6 @@ call scripts/tpl_variables.bat
 
 call scripts/makeAll.bat
 
-::pause
+pause
 
 exit
\ No newline at end of file
index ce1d0f211aed5b84c9d95e0d739b17ff97a28803..79f1bc4e7365846cb052ca6ac8f0e443fb88eae9 100644 (file)
@@ -40,7 +40,6 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 
 if not exist %wgetPath% (
   echo ERROR!!! wget has not been found in the system
-  pause
   exit
 )
 
@@ -61,7 +60,7 @@ set WXVERSION=3.0.4
 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
+set XERCESFNAME=xerces-c-3.2.3.zip
 ::set VTKFNAME=vtk-5.10.0.zip
 :: set VTKFNAME=VTK-8.1.1-patch_mingw64.7z
 set VTKFNAME=VTK-8.1.1-Patch.7z
@@ -151,7 +150,10 @@ if %EEDdownloadBOOST%==FALSE GOTO SKIPDOWNLOADBOOST
 :SKIPDOWNLOADBOOST
 
 if %EEDdownloadXERCES%==FALSE GOTO SKIPDOWNLOADXERCES
-  %wgetPath% "http://mirror.ibcp.fr/pub/apache//xerces/c/3/sources/%XERCESFNAME%"
+::  %wgetPath% "http://mirror.ibcp.fr/pub/apache//xerces/c/3/sources/%XERCESFNAME%"
+  %wgetPath% --no-check-certificate "%urlCreatisSource%/%XERCESFNAME%"
+  echo   %wgetPath% "http://mirror.ibcp.fr/pub/apache//xerces/c/3/sources/%XERCESFNAME%"
+
 ::  %wgetPath% --no-check-certificate "https://archive.apache.org/dist/xerces/c/3/sources/%XERCESFNAME%"
   echo -----------------------------------
   echo -------------XERCES----------------
@@ -214,7 +216,6 @@ if %EEDdownloadDLFCN%==FALSE GOTO SKIPDOWNLOADDLFCN
   %zipPath% x %DLFCNFNAME%
 ::  del %DLFCNFNAME%
 :SKIPDOWNLOADDLFCN
-pause
 if %EEDdownloadOPENGLMESA%==FALSE GOTO SKIPDOWNLOADOPENGLMESA
   %wgetPath% --no-check-certificate "%urlCreatisSource%/../../../crea_Developer_Tools/v4/%OPENGLMESANAME%"
   echo ------------------------------------------------
@@ -222,7 +223,6 @@ if %EEDdownloadOPENGLMESA%==FALSE GOTO SKIPDOWNLOADOPENGLMESA
   echo ------------------------------------------------
   cd %sourcepath%
   %zipPath% x %OPENGLMESANAME%
-pause  
 ::  del %OPENGLMESANAME%
 :SKIPDOWNLOADOPENGLMESA
 
@@ -239,7 +239,7 @@ rename InsightToolkit-4.12.1 itk
 rename VTK-8.1.1 vtk
 rename gdcm13_2018_05_28_vtk8 gdcm13
 rename tth_exe tth
-rename xerces-c-3.2.1 xerces
+rename xerces-c-3.2.3 xerces
 rename sqlite_v3.6.23.1 sqlite
 
 echo -----End of Download Libraries-----
index d0ff9fc37fefede9809beb74d683653f466f480a..5894d9cf4981d2c4d313edee0d5bb49bcaf167a3 100644 (file)
@@ -144,7 +144,7 @@ cd %wxWidgets%Bin
 
 :: 3.0.4 manual
 :: https://wiki.wxwidgets.org/Compiling_wxWidgets_with_MinGW
-cd %sourcepath%\%wxWidgets%\build\msw                                              
+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
index 0e69ec780b7a24aa91e8fccef77ba8b28f6a9da6..749c8ce831d2bf07c3f5104605ad83892442f5e2 100644 (file)
@@ -1,14 +1,20 @@
 =============================  Third Part Library  ==========================
 
-1. Install: 
+1. Install from /home/davila/public_html/creatools_back_site/crea_Developer_Tools/v4 
        - 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
+       - cmake 2.8.12 >=
        - wget
+       - basic-miktex-2.9.6753-x64.exe
+       - nsis-3.03-setup.exe
+
        - 7z
-       - cmake 2.8.12 >=
         - git ????? como donde instalarlo
-   
+        - key ssh: copy the id_rsa version 2 in <Users>\.ssh  (see mail ups rsa 2)
+
 2. Clone creaToolsTools 
-     -Cambiar la branch
+     -Cambiar la branch  (mingw64)
      -En creaToolsTools\Install_mingw64\Install_ThirdParty\install_All.bat ajustar el path de:
                        cmakeBin
                        thirdpartyGenerationBase
 opcion de clean y download se renombran los source automatidacmente  (OJO con wxWindgets, hay que hacerlo a mano)
 
 
-
-        
-
-
-
 =============================  Creatools  ==========================
 
 0. Configuration