From f29a95efacb5238c370a0adeb5d39b7d95c7b0f8 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 5 Jun 2013 16:09:39 +0200 Subject: [PATCH] 2017 SQLite Debug in version CreaTools win64 RELEASE --- Install/scripts/All.bat | 14 ++++---- Install/scripts/All2.bat | 7 ++-- .../crea_ThirdParty_Libraries/CMakeLists.txt | 2 +- .../install/CMakeLists.txt | 3 ++ .../scripts/download_ThirdPartySW.bat | 11 ++++++ .../scripts/install_thirdparty_all.bat | 34 ++++++++++++++++++- .../scripts/move_thirdparty_dlls.bat | 13 +++++++ .../scripts/move_thirdparty_libraries.bat | 18 ++++++++++ Install_ThirdParty/scripts/tpl_variables.bat | 34 ++++++++++--------- 9 files changed, 109 insertions(+), 27 deletions(-) diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat index 6632351..3807d20 100644 --- a/Install/scripts/All.bat +++ b/Install/scripts/All.bat @@ -35,17 +35,17 @@ mkdir %logFolder% echo call configure variables call %scriptsFolder%\base\configureVariables.bat -echo call Download Sources -start /B /wait %scriptsFolder%\base\downloadSources.bat +REM ::echo call Download Sources +REM start /B /wait %scriptsFolder%\base\downloadSources.bat cd %scriptsFolder% echo %cd% -call All2.bat %creatoolsGeneration% %docGeneration% Debug Win32 -cd %scriptsFolder% -call All2.bat %creatoolsGeneration% %docGeneration% Debug Win64 -cd %scriptsFolder% -call All2.bat %creatoolsGeneration% %docGeneration% Release Win32 +REM call All2.bat %creatoolsGeneration% %docGeneration% Debug Win32 +REM cd %scriptsFolder% +REM call All2.bat %creatoolsGeneration% %docGeneration% Debug Win64 +REM cd %scriptsFolder% +REM call All2.bat %creatoolsGeneration% %docGeneration% Release Win32 cd %scriptsFolder% call All2.bat %creatoolsGeneration% %docGeneration% Release Win64 echo ..End.. diff --git a/Install/scripts/All2.bat b/Install/scripts/All2.bat index cff2fd7..b742e7d 100644 --- a/Install/scripts/All2.bat +++ b/Install/scripts/All2.bat @@ -46,8 +46,7 @@ mkdir creatools_%buildtype%%platforme%\installLog echo call configure variables call %scriptsFolder%\base\configureVariables.bat -REM goto skypToEED -REM :skypToEED +goto skypToEED echo call compile crea echo start /B /wait %scriptsFolder%\crea\creaInstall.bat @@ -60,6 +59,9 @@ echo call compile creaEnvironment start /B /wait %scriptsFolder%\creaEnvironment\creaEnvironmentInstall.bat echo call compile creaBruker start /B /wait %scriptsFolder%\creaBruker\creaBrukerInstall.bat + +:skypToEED + echo call compile creaImageIO start /B /wait %scriptsFolder%\creaImageIO\creaImageIOInstall.bat echo call compile creaContours @@ -72,6 +74,7 @@ echo call compile creaMinitools start /B /wait %scriptsFolder%\creaTools\creaMinitoolsInstall.bat + echo THIS HAS TO BE THE LAST STEP... echo call compile creaTools start /B /wait %scriptsFolder%\creaTools\creaToolsInstall.bat diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt index 0a7b339..e019744 100644 --- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ################################### -PROJECT(creaTPL) +PROJECT(crea_TPL) ################################### #================================== diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt index b7dcf2e..a10c231 100644 --- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt @@ -57,6 +57,7 @@ IF(WIN32 AND NOT UNIX) set (CREA_VTK_LYBRARY vtk ) set (CREA_WXWIN_LYBRARY wxWidgets) set (CREA_XERCES_LYBRARY xerces) + set (CREA_SQLITE_LYBRARY sqlite) #DFCH -- set (CREA_MIKATEX_LYBRARY miktex) #set (CREA_KWWIDGETS_LYBRARY KWWidgets-090109 ) @@ -102,6 +103,7 @@ IF (WIN32) INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_VTK_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_WXWIN_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_XERCES_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) + INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_SQLITE_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) #DFCH -- SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MiKTeX-2.9\\\\miktex\\\\bin") @@ -132,6 +134,7 @@ IF (WIN32) WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'VTK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_VTK_LYBRARY}\\\\lib\\\\vtk-5.10' WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'WXWIN' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_WXWIN_LYBRARY}' WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'XERCES_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_XERCES_LYBRARY}' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'SQLITE_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_SQLITE_LYBRARY}' #WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'KWWidgets_dir' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_KWWIDGETS_LYBRARY}\\\\lib\\\\KWWidgets' CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Version.txt.lnk' '${CREATPL_DIRBIN}\\\\Version.txt' diff --git a/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_ThirdParty/scripts/download_ThirdPartySW.bat index 9604c29..263ab88 100644 --- a/Install_ThirdParty/scripts/download_ThirdPartySW.bat +++ b/Install_ThirdParty/scripts/download_ThirdPartySW.bat @@ -70,6 +70,7 @@ set GDCMFNAME=gdcm_11_Oct_2011.tar ::set GDCMFNAME=gdcm_05_Mai_2011.tar set TTHFNAME=tth_exe.zip set JOMFNAME=jom.zip +set SQLITEFNAME=sqlite_v3.6.23.1.zip echo ----------------------------------- echo Environment variables Configuration @@ -186,6 +187,15 @@ if %EEDdownloadTTH%==FALSE GOTO SKIPDOWNLOADTTH del %TTHFNAME% :SKIPDOWNLOADTTH +if %EEDdownloadSQLite%==FALSE GOTO SKIPDOWNLOADSQLITE + %wgetPath% "http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/%SQLITEFNAME%" + echo ------------------------------------------------ + echo --------------SQLite (creatis)------------------ + echo ------------------------------------------------ + cd %sourcepath% + %zipPath% x %SQLITEFNAME% + del %SQLITEFNAME% +:SKIPDOWNLOADSQLITE echo ----------------------------------- @@ -201,6 +211,7 @@ rename VTK vtk rename gdcm gdcm13 rename tth_exe tth rename xerces-c-3.1.1 xerces +rename sqlite_v3.6.23.1 sqlite echo -----End of Download Libraries----- echo ----------------------------------- diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat index fe46fb1..5cffb17 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_all.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat @@ -40,6 +40,7 @@ set xercesc=xerces set itk=itk set gdcm=gdcm13 set vtk=vtk +set sqlite=sqlite set QTDIR=%sourcepath%\%qt% set JOMDIR=%sourcepath%\%jom% @@ -49,6 +50,7 @@ set XERCESDIR=%sourcepath%\%xercesc% set ITKSRCDIR=%sourcepath%\%itk% set VTKSRCDIR=%sourcepath%\%VTK% set GDCMSRCDIR=%sourcepath%\%gdcm% +set SQLITESRCDIR=%sourcepath%\%sqlite% set LogFolder=%thirdpartyGeneration%\installLog echo ----------------------------------- @@ -75,6 +77,7 @@ echo ITKSRCDIR=%ITKSRCDIR% echo VTKSRCDIR=%VTKSRCDIR% echo GDCMDIR=%GDCMSRCDIR% echo JOMDIR=%JOMDIR% +echo SQLITEDIR=%SQLITESRCDIR% echo ----------------------------------- echo ---End Setting Global Variables---- @@ -237,7 +240,6 @@ cd c:\ :SKIPINSTALLITK - if %EEDinstallXERCES%==FALSE GOTO SKIPINSTALLXERCES echo ----------------------------------- echo ------XERCES Installation---------- @@ -250,6 +252,36 @@ cd c:\ :SKIPINSTALLXERCES + +echo ---------------------------------------- +echo -------- SQLite Installation------------ +echo ---------------------------------------- + +if %EEDinstallSQLite%==FALSE GOTO SKIPINSTALLSQLite +echo ----------------------------------- +echo -------SQLite Installation------------ +echo ----------------------------------- +cd %binpath% +mkdir %SQLite%Bin +cd %SQLite%Bin +if %x86Comp%==ON ( + cmake -G"Visual Studio 10" -H%sourcepath%\%SQLite% -B%binpath%\%SQLite%Bin >> %LogFolder%\SQLiteInstall.log 2>&1 +) else ( + if %PROCESSOR_ARCHITECTURE%==x86 ( + cmake -G"Visual Studio 10" -H%sourcepath%\%SQLite% -B%binpath%\%SQLite%Bin >> %LogFolder%\SQLiteInstall.log 2>&1 + ) else ( + cmake -G"Visual Studio 10 Win64" -H%sourcepath%\%SQLite% -B%binpath%\%SQLite%Bin >> %LogFolder%\SQLiteInstall.log 2>&1 + ) +) +cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%SQLite%\ CMakeCache.txt >> %LogFolder%\SQLiteInstall.log 2>&1 +cmake CMakeCache.txt >> %LogFolder%\SQLiteInstall.log 2>&1 +FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /target:ALL_BUILD /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\SQLiteInstall.log 2>&1 +msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj >> %LogFolder%\SQLiteInstall.log 2>&1 +cd c:\ +:SKIPINSTALLSQLite + + + echo ----------------------------------- echo ---End of Installing Libraries----- echo ----------------------------------- diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat index 0b3c0f3..7726001 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat @@ -26,6 +26,7 @@ set itk=itk set gdcm=gdcm13 set vtk=vtk set tth=tth +set sqlite=sqlite set QTDIR=%sourcepath%\%qt% set WXDIR=%sourcepath%\%wxWidgets% @@ -38,6 +39,7 @@ set BOOSTINSTALLDIR=%installpath%\%boost% set ITKINSTALLDIR=%installpath%\%itk% set VTKINSTALLDIR=%installpath%\%vtk% set GDCMINSTALLDIR=%installpath%\%gdcm% +set SQLITEINSTALLDIR=%installpath%\%sqlite% rmdir /S /Q %creaThirdPartydlls% @@ -93,6 +95,7 @@ echo BOOSTDIR=%BOOSTDIR% echo XERCESDIR=%XERCESDIR% echo ITKSRCDIR=%ITKSRCDIR% echo VTKSRCDIR=%VTKSRCDIR% +echo SQLSRCDIR=%SQLITESRCDIR% echo ----------------------------------- @@ -197,6 +200,16 @@ echo ----------------------------------- copy /V /Y %GDCMINSTALLDIR%\bin\*.exe %creaThirdPartydlls% copy /V /Y %GDCMINSTALLDIR%\bin\*.dll %creaThirdPartydlls% + +echo ----------------------------------- +echo -------------SQLite------------------ +echo ----------------------------------- + +echo copy /V /Y %SQLITEINSTALLDIR%\bin\*.dll %creaThirdPartydlls% +copy /V /Y %SQLITEINSTALLDIR%\bin\*.dll %creaThirdPartydlls% + + + echo ----------------------------------- echo ------End of Moving Dlls----------- echo ----------------------------------- diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat index b4b7358..04fb885 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat @@ -37,6 +37,7 @@ set itk=itk set gdcm=gdcm13 set vtk=vtk set tth=tth +set sqlite=sqlite set QTDIR=%sourcepath%\%qt% @@ -51,6 +52,7 @@ set ITKINSTALLDIR=%installpath%\%itk% set VTKINSTALLDIR=%installpath%\%vtk% set GDCMINSTALLDIR=%installpath%\%gdcm% set TTHDIR=%sourcepath%\%tth% +set SQLITEINSTALLDIR=%installpath%\%sqlite% if %buildType%==release ( set qtBtype=4 @@ -98,6 +100,7 @@ echo BOOSTDIR=%BOOSTDIR% echo XERCESDIR=%XERCESDIR% echo ITKSRCDIR=%ITKSRCDIR% echo VTKSRCDIR=%VTKSRCDIR% +echo SQLITESRCDIR=%SQLITESRCDIR% rmdir /S /Q %creaThirdPartyLibraries% @@ -442,6 +445,21 @@ echo ----------------------------------- mkdir %creaThirdPartyLibraries%\tth XCOPY %TTHDIR%\* %creaThirdPartyLibraries%\%tth% /s /i + +echo ----------------------------------- +echo -------------SQLite------------------ +echo ----------------------------------- +mkdir %creaThirdPartyLibraries%\%sqlite% +mkdir %creaThirdPartyLibraries%\%sqlite%\include +mkdir %creaThirdPartyLibraries%\%sqlite%\lib + +echo XCOPY %SQLITEINSTALLDIR%\include\* %creaThirdPartyLibraries%\%sqlite%\include /s /i +XCOPY %SQLITEINSTALLDIR%\include\* %creaThirdPartyLibraries%\%sqlite%\include /s /i +XCOPY %SQLITEINSTALLDIR%\lib\* %creaThirdPartyLibraries%\%sqlite%\lib /s /i + + + + echo ----------------------------------- echo -----End of Moving Libraries------- echo ----------------------------------- diff --git a/Install_ThirdParty/scripts/tpl_variables.bat b/Install_ThirdParty/scripts/tpl_variables.bat index 928c8f2..80350ba 100644 --- a/Install_ThirdParty/scripts/tpl_variables.bat +++ b/Install_ThirdParty/scripts/tpl_variables.bat @@ -1,27 +1,29 @@ -set EEDclean=TRUE +set EEDclean=FALSE set EEDcleanSOURCES=TRUE set EEDcleanBIN=TRUE set EEDcleanINSTALL=TRUE set EEDcleanLOGS=TRUE set EEDdownload=TRUE -set EEDdownloadQT=TRUE -set EEDdownloadITK=TRUE -set EEDdownloadWXWINDOWS=TRUE -set EEDdownloadBOOST=TRUE -set EEDdownloadXERCES=TRUE -set EEDdownloadVTK=TRUE -set EEDdownloadGDCM=TRUE -set EEDdownloadTTH=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=TRUE set EEDinstall=TRUE -set EEDinstallQT=TRUE -set EEDinstallWXWIDGETS=TRUE -set EEDinstallBOOST=TRUE -set EEEDinstallVTK=TRUE -set EEDinstallGDCM=TRUE -set EEDinstallITK=TRUE -set EEDinstallXERCES=TRUE +set EEDinstallQT=FALSE +set EEDinstallWXWIDGETS=FALSE +set EEDinstallBOOST=FALSE +set EEEDinstallVTK=FALSE +set EEDinstallGDCM=FALSE +set EEDinstallITK=FALSE +set EEDinstallXERCES=FALSE +set EEDinstallSQLite=TRUE set EEDinstallerDLL=TRUE -- 2.47.1