From ffc80305382382ef4735c1565d6ba8c957f52b83 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Fri, 20 Jul 2018 17:23:30 +0200 Subject: [PATCH] #3200creaToolsToolsFeatureNewNormalbranch mingw64 --- .../Install_ThirdParty/install-All.bat | 12 +++++- ...install_generate_thirdparty-x64Release.bat | 2 +- .../scripts/download_ThirdPartySW.bat | 23 +++++++---- .../scripts/generateThirdPartydllsExe.bat | 2 +- .../scripts/install_thirdparty_all.bat | 26 ++++++++++++- .../scripts/tpl_variables.bat | 38 +++++++++---------- Install_mingw64/Readme_EED.txt | 14 +++---- 7 files changed, 79 insertions(+), 38 deletions(-) diff --git a/Install_mingw64/Install_ThirdParty/install-All.bat b/Install_mingw64/Install_ThirdParty/install-All.bat index 8740543..4050de9 100644 --- a/Install_mingw64/Install_ThirdParty/install-All.bat +++ b/Install_mingw64/Install_ThirdParty/install-All.bat @@ -1,6 +1,16 @@ + +set thirdpartyGenerationBase=E:\creatis\CreaTools_minwg64\C5\tpl\ + +set cmakeBin=E:\creatis\CreaTools_minwg64\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe + +set wgetPath="E:\creatis\CreaTools_minwg64\For_mingw64\DeveloperTools\wget-1.19.4-win32\wget.exe" + +set zipPath="C:\Program Files\7-Zip\7z.exe" +::set zipPath="peazip -ext2here " + 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 9efae7f..6e5f918 100644 --- 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 6cd3fcf..cf72494 100644 --- 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 @@ -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,13 +203,27 @@ 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 ----------------------------------- cd %sourcepath% rename qt-everywhere-opensource-src-4.8.2 qt rename wxWidgets_%WXVERSION% wxWidgets -rename boost_1_64_0 boost +rename boost_1_63_0 boost rename InsightToolkit-4.12.1 itk rename VTK-8.1.1 vtk rename gdcm13_2018_05_28_vtk8 gdcm13 diff --git a/Install_mingw64/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat b/Install_mingw64/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat index 7f5ab6e..6e06bce 100644 --- 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 4493e80..2808f96 100644 --- 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,29 @@ 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 + 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/tpl_variables.bat b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat index d471907..ca599b6 100644 --- 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 9fac0d9..5f5bd44 100644 --- 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 -- 2.47.1