Merge branch 'mingw64' of ssh://git.creatis.insa-lyon.fr/creaToolsTools into mingw64

diff --git a/Install_mingw64/Install_ThirdParty/install-All.bat b/Install_mingw64/Install_ThirdParty/install-All.bat
index 8740543372ba813e8a29b6f1b90f7e7d604cdd0b..a0439608a654295fb8f26466a741340b6822874b 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/install-All.bat
+++ b/Install_mingw64/Install_ThirdParty/install-All.bat
@@ -1,6 +1,18 @@
+
+set thirdpartyGenerationBase=E:\creatis\c_mingw\C5\tpl\
+
+set cmakeBin=E:\creatis\c_mingw\For_mingw64\DeveloperTools\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 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
+
 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
\ No newline at end of file

diff --git a/Install_mingw64/Install_ThirdParty/install_generate_thirdparty-x64Release.bat b/Install_mingw64/Install_ThirdParty/install_generate_thirdparty-x64Release.bat
index 9efae7fa27eebf06b21cd9d3c7999e042651104b..6e5f918093ef4b0a61f7160baa416fed14b5c86a 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/install_generate_thirdparty-x64Release.bat
+++ b/Install_mingw64/Install_ThirdParty/install_generate_thirdparty-x64Release.bat
@@ -6,7 +6,7 @@ echo -----------------------------------
 echo ---Setting Environment Variables---
 echo -----------------------------------
 
-set thirdpartyGeneration=C:\Users\davila\Creatools\C5\tpl\x64-R
+set thirdpartyGeneration=%thirdpartyGenerationBase%\x64-R
 set buildType=release
 
 ::Set the following line ON if you want to force x86 compilation

diff --git a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
index 6cd3fcfc2a003cc1ccc9e4c1ae62240cf3c286d3..ba3e2bc81bf755e9d558a727fb3d53e0722868b6 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
@@ -22,10 +22,7 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
   echo "Architecture found = x64"
 )
 
-::set zipPath="%ProgramFilesPath_x86%\7-Zip\7z.exe"
-set zipPath="peazip -ext2here "
 ::set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
-set wgetPath="C:\Users\davila\Creatools\For_mingw64\DeveloperTools\wget32\wget.exe"
 
 ::if not exist %zipPath% set zipPath="%ProgramFilesPath_x64%\7-Zip\7z.exe"
 ::if not exist %zipPath% (
@@ -53,8 +50,6 @@ set sourcepath=%thirdpartyGeneration%\tps
 set LogFolder=%thirdpartyGeneration%\installLog
 
 set QTFNAME=qt-everywhere-opensource-src-4.8.2.zip
-
-
 ::set ITKFNAME=InsightToolkit-3.20.1.zip
 set ITKFNAME=InsightToolkit-4.12.1.tar
 ::set WXFNAME=wxWidgets-2.8.12.zip
@@ -63,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
@@ -76,8 +71,8 @@ set VTKFNAME=VTK-8.1.1-Patch.7z
 set GDCMFNAME=gdcm13_2018_05_28_vtk8.zip
 set TTHFNAME=tth_exe.zip
 set SQLITEFNAME=sqlite_v3.6.23.1.zip
-
 set JOMFNAME=jom.zip
+set DLFCNFNAME=dlfcn-win32-2018-07.7z
 
 
 echo -----------------------------------
@@ -208,6 +203,20 @@ if %EEDdownloadSQLite%==FALSE GOTO SKIPDOWNLOADSQLITE
 :SKIPDOWNLOADSQLITE
 
 
+if %EEDdownloadDLFCN%==FALSE GOTO SKIPDOWNLOADDLFCN
+  %wgetPath% --no-check-certificate "%urlCreatisSource%/%DLFCNFNAME%"
+::  git clone https://github.com/dlfcn-win32/dlfcn-win32.git
+  echo ------------------------------------------------
+  echo --------------DLFCN (creatis)------------------
+  echo ------------------------------------------------
+  cd %sourcepath%
+  %zipPath% x %DLFCNFNAME%
+::  del %DLFCNFNAME%
+:SKIPDOWNLOADDLFCN
+
+
+
+
 echo -----------------------------------
 echo --------Renaming Folders-----------
 echo -----------------------------------

diff --git a/Install_mingw64/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat b/Install_mingw64/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat
index 7f5ab6e19530a13405d3244b0f420edcbab11b09..6e06bce8c1ca4fcabebff37edce92f8e5c1249a4 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat
@@ -12,4 +12,4 @@ set LogFolder=%thirdpartyGeneration%\installLog
 echo Calling install_thirdparty_dlls_cmake.bat
 call install_thirdparty_dlls_cmake.bat  %thirdpartyGeneration% %buildType% %x86Comp% >> %LogFolder%\generateThirdpartydllsExe.log 2>&1
 
-::exit
\ No newline at end of file
+exit /B
\ No newline at end of file

diff --git a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 4493e80d2749653a6ac9d7f1453250016c385bff..afa83a023101a24232f8e69f8ef658636a059294 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -41,6 +41,7 @@ set itk=itk
 set gdcm=gdcm13
 set vtk=vtk
 set sqlite=sqlite
+set dlfcn=dlfcn-win32
 
 set QTDIR=%sourcepath%\%qt%
 set JOMDIR=%sourcepath%\%jom%
@@ -51,6 +52,7 @@ set ITKSRCDIR=%sourcepath%\%itk%
 set VTKSRCDIR=%sourcepath%\%VTK%
 set GDCMSRCDIR=%sourcepath%\%gdcm%
 set SQLITESRCDIR=%sourcepath%\%sqlite%
+set DLFCNSRCDIR=%sourcepath%\%dlfcn%
 set LogFolder=%thirdpartyGeneration%\installLog
 
 echo -----------------------------------
@@ -78,6 +80,7 @@ echo VTKSRCDIR=%VTKSRCDIR%
 echo GDCMDIR=%GDCMSRCDIR%
 echo JOMDIR=%JOMDIR%
 echo SQLITEDIR=%SQLITESRCDIR%
+echo DLFCNSRCDIR=%DLFCNSRCDIR%
 
 echo -----------------------------------
 echo ---End Setting Global Variables----
@@ -353,8 +356,33 @@ mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install
 
 
 
+if %EEDinstallDLFCN%==FALSE GOTO SKIPINSTALLDLFCN
+echo -----------------------------------
+echo -------SKIPINSTALLDLFCN Installation------------
+echo -----------------------------------
+cd  %binpath%
+mkdir %DLFCN%Bin
+cd %DLFCN%Bin
+
+%cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%DLFCN% -B%binpath%\%DLFCN%Bin                               >> %LogFolder%\SQLiteInstall.log 2>&1
+%cmakeBin% -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt    >> %LogFolder%\SQLiteInstall.log 2>&1
+%cmakeBin% CMakeCache.txt                                                                                  >> %LogFolder%\SQLiteInstall.log 2>&1
+mingw32-make.exe -j%NUMBER_OF_PROCESSORS%                                                                  >> %LogFolder%\GDCMInstall.log      2>&1
+mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install                                                          >> %LogFolder%\GDCMInstall.log      2>&1
+
+:SKIPINSTALLDLFCN
+
+::boost
+move /Y %installpath%\lib\*.dll %installpath%\bin
+::wxWidgets
+move /Y %installpath%\lib\gcc_dll\*.dll %installpath%\bin
+
+:: dlls mingw
+copy /Y %DirMingwDlls%\*.dll %installpath%\bin
+
+
 echo -----------------------------------
 echo ---End of Installing Libraries-----
 echo -----------------------------------
 
-exit
\ No newline at end of file
+exit /B
\ No newline at end of file

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
 
 

diff --git a/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat
index d471907bb89ed761d3061d651357cd5d23e2dd47..ca599b65a41b83591b3b5fec41937f1e36df2d66 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat
@@ -1,32 +1,32 @@
 
-set cmakeBin=C:\Users\davila\Creatools\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe
-
-set  EEDclean=FALSE
+set  EEDclean=TRUE
 set  EEDcleanSOURCES=FALSE
 set  EEDcleanBIN=TRUE
 set  EEDcleanINSTALL=TRUE
 set  EEDcleanLOGS=TRUE
 
-set  EEDdownload=FALSE
+set  EEDdownload=TRUE
 set  EEDdownloadQT=FALSE
-set  EEDdownloadITK=FALSE
-set  EEDdownloadWXWINDOWS=FALSE
-set  EEDdownloadBOOST=FALSE
-set  EEDdownloadXERCES=FALSE
-set  EEDdownloadVTK=FALSE
-set  EEDdownloadGDCM=FALSE
-set  EEDdownloadTTH=FALSE
-set  EEDdownloadSQLite=FALSE
+set  EEDdownloadITK=TRUE
+set  EEDdownloadWXWINDOWS=TRUE
+set  EEDdownloadBOOST=TRUE
+set  EEDdownloadXERCES=TRUE
+set  EEDdownloadVTK=TRUE
+set  EEDdownloadGDCM=TRUE
+set  EEDdownloadTTH=TRUE
+set  EEDdownloadSQLite=TRUE
+set  EEDdownloadDLFCN=TRUE
 
 set  EEDinstall=TRUE
 set  EEDinstallQT=FALSE
-set  EEDinstallWXWIDGETS=FALSE
+set  EEDinstallWXWIDGETS=TRUE
 set  EEDinstallBOOST=TRUE
-set  EEEDinstallVTK=FALSE
-set  EEDinstallGDCM=FALSE
-set  EEDinstallITK=FALSE
-set  EEDinstallXERCES=FALSE
-set  EEDinstallSQLite=FALSE
+set  EEEDinstallVTK=TRUE
+set  EEDinstallGDCM=TRUE
+set  EEDinstallITK=TRUE
+set  EEDinstallXERCES=TRUE
+set  EEDinstallSQLite=TRUE
+set  EEDinstallDLFCN=TRUE
 
-set  EEDinstallerDLL=FALSE
+set  EEDinstallerDLL=TRUE
 set  EEDinstallerLibraries=FALSE

diff --git a/Install_mingw64/Readme_EED.txt b/Install_mingw64/Readme_EED.txt
index 9fac0d9412392a6fd48bcfad84a246415e513d09..5f5bd44b61405d3e3594dd0a584f2e28e6d27f3d 100644 (file)
--- a/Install_mingw64/Readme_EED.txt
+++ b/Install_mingw64/Readme_EED.txt
@@ -1,6 +1,5 @@
 =============================  Third Part Library  ==========================
 
-
 1. Install: 
        - mingw-64  V7.3  Version x86_64  
        - wget
@@ -10,18 +9,17 @@
    
 2. Clone creaToolsTools 
      -Cambiar la branch
-     -En creaToolsTools\Install_mingw64\Install_ThirdParty
-        -Ajuster le path en install_generate_thirdparty-x64Release.bat
-     -En creaToolsTools\Install_mingw64\Install_ThirdParty\scripts\install_thirdparty_all.bat
-        -Ajuster el path de cmake.exe
-     -En creaToolsTools\Install_mingw64\Install_ThirdParty\scripts\download_thirdPartySW.bat
-        -Ajuster el path de wget
-        -Ajuster el path de 7z
+     -En creaToolsTools\Install_mingw64\Install_ThirdParty\install_All.bat ajustar el path de:
+                       cmakeBin
+                       thirdpartyGenerationBase
+                       wget
+                       zipPath
      -En creaToolsTools\Install_mingw64\Install_ThirdParty\scripts\tpl_variables.bat
         - Verificar que es TRUE y FALSE
 
 3. Compile Third Party Library  (tpl)
      install-All.bat
+        
 4. Compila Creatools
     -Instalar basic-miktex-2.9.6753-x64.exe
     -plink: configurar en creaToolsTools\Install_mingw64\Install_CreaTools/downloadSources.bat