From: Diego Caceres Date: Mon, 28 Nov 2011 07:55:40 +0000 (+0000) Subject: DFCH: Some bugs Solved!! X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaToolsTools.git;a=commitdiff_plain;h=706b0ca702c02384f0628497756f1cb9b1a4ed21 DFCH: Some bugs Solved!! --- diff --git a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE index 60e8098..01faf82 100644 --- a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE +++ b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE @@ -1,15 +1,50 @@ +@echo off + +echo ----------------------------------- +echo ---Setting Environment Variables--- +echo ----------------------------------- + set thirdpartyGeneration= set buildType= +echo thirdpartyGeneration=%thirdpartyGeneration% +echo buildType=%buildType% + +echo ----------------------------------- +echo ---End Setting Global Variables---- +echo ----------------------------------- + +echo ----------------------------------- +echo -------Calling Scripts------------- +echo ----------------------------------- + cd scripts + +echo Calling install_thirdparty_all.bat + call install_thirdparty_all.bat %thirdpartyGeneration% %buildType% >> install_generate_thirdparty.log 2>&1 +echo Calling move_thirdparty_dlls.bat + call move_thirdparty_dlls.bat %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1 +echo Calling move_thirdparty_libraries.bat + call move_thirdparty_libraries.bat %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1 +echo Calling install_thirdparty_dlls_cmake.bat + call install_thirdparty_dlls_cmake.bat %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1 +echo Calling install_thirdparty_libraries_cmake.bat + call install_thirdparty_libraries_cmake.bat %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1 -cd .. \ No newline at end of file +cd .. + +echo ----------------------------------- +echo -------End of the Script----------- +echo ----------------------------------- + +pause +exit \ No newline at end of file diff --git a/Install_ThirdParty/install_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_thirdparty.bat_TEMPLATE index 7f940e7..5e6d1d0 100644 --- a/Install_ThirdParty/install_thirdparty.bat_TEMPLATE +++ b/Install_ThirdParty/install_thirdparty.bat_TEMPLATE @@ -1,8 +1,36 @@ +@echo off + +echo ----------------------------------- +echo ---Setting Environment Variables--- +echo ----------------------------------- set thirdpartyGeneration= set buildType= + +echo thirdpartyGeneration=%thirdpartyGeneration% +echo buildType=%buildType% + +echo ----------------------------------- +echo ---End Setting Global Variables---- +echo ----------------------------------- + +echo ----------------------------------- +echo -------Calling Scripts------------- +echo ----------------------------------- + cd scripts + +echo Calling install_thirdparty_all.bat + call install_thirdparty_all.bat %thirdpartyGeneration% %buildType% >> install.log 2>&1 + cd .. +echo ----------------------------------- +echo -------End of the Script----------- +echo ----------------------------------- + +pause + +exit diff --git a/Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE b/Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE index 8e1525c..747e7c2 100644 --- a/Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE +++ b/Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE @@ -1,6 +1,32 @@ +@echo off + +echo ----------------------------------- +echo ---Setting Environment Variables--- +echo ----------------------------------- set thirdpartyGeneration= +echo thirdpartyGeneration=%thirdpartyGeneration% + +echo ----------------------------------- +echo ---End Setting Global Variables---- +echo ----------------------------------- + +echo ----------------------------------- +echo -------Calling Scripts------------- +echo ----------------------------------- + cd scripts + +echo Calling install_thirdparty_dlls_cmake.bat + call install_thirdparty_dlls_cmake.bat %thirdpartyGeneration% >> install_thirdparty_dlls_cmake.log 2>&1 -cd .. \ No newline at end of file + +cd .. + +echo ----------------------------------- +echo -------End of the Script----------- +echo ----------------------------------- + +pause +exit \ No newline at end of file diff --git a/Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE b/Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE index 4bf4111..7cf1ccb 100644 --- a/Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE +++ b/Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE @@ -1,6 +1,32 @@ +@echo off + +echo ----------------------------------- +echo ---Setting Environment Variables--- +echo ----------------------------------- set thirdpartyGeneration= +echo thirdpartyGeneration=%thirdpartyGeneration% + +echo ----------------------------------- +echo ---End Setting Global Variables---- +echo ----------------------------------- + +echo ----------------------------------- +echo -------Calling Scripts------------- +echo ----------------------------------- + cd scripts + +echo Calling install_thirdparty_libraries_cmake.bat + call install_thirdparty_libraries_cmake.bat %thirdpartyGeneration% >> install_thirdparty_libraries_cmake.log 2>&1 -cd .. \ No newline at end of file + +cd .. + +echo ----------------------------------- +echo -------End of the Script----------- +echo ----------------------------------- + +pause +exit \ No newline at end of file diff --git a/Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE b/Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE index 3754399..962fe23 100644 --- a/Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE +++ b/Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE @@ -1,7 +1,33 @@ +@echo off + +echo ----------------------------------- +echo ---Setting Environment Variables--- +echo ----------------------------------- set thirdpartyGeneration= +echo thirdpartyGeneration=%thirdpartyGeneration% + +echo ----------------------------------- +echo ---End Setting Global Variables---- +echo ----------------------------------- + +echo ----------------------------------- +echo -------Calling Scripts------------- +echo ----------------------------------- + cd scripts + +echo Calling move_thirdparty_dlls.bat + call move_thirdparty_dlls.bat %thirdpartyGeneration% >> move_thirdparty_dlls.log 2>&1 + cd .. +echo ----------------------------------- +echo -------End of the Script----------- +echo ----------------------------------- + +pause +exit + diff --git a/Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE b/Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE index b01123f..cb7329c 100644 --- a/Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE +++ b/Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE @@ -1,6 +1,32 @@ +@echo off + +echo ----------------------------------- +echo ---Setting Environment Variables--- +echo ----------------------------------- set thirdpartyGeneration= +echo thirdpartyGeneration=%thirdpartyGeneration% + +echo ----------------------------------- +echo ---End Setting Global Variables---- +echo ----------------------------------- + +echo ----------------------------------- +echo -------Calling Scripts------------- +echo ----------------------------------- + cd scripts + +echo Calling move_thirdparty_libraries.bat + call move_thirdparty_libraries.bat %thirdpartyGeneration% >> move_thirdparty_libraries.log 2>&1 -cd .. \ No newline at end of file + +cd .. + +echo ----------------------------------- +echo -------End of the Script----------- +echo ----------------------------------- + +pause +exit \ No newline at end of file diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat index cb2ca2f..2217d22 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_all.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat @@ -17,7 +17,7 @@ if %PROCESSOR_ARCHITECTURE%==x86 ( echo ----End Asking Architecture-------- echo ----------------------------------- -echo ---Setting Environment Variables---- +echo ---Setting Environment Variables--- echo ----------------------------------- set thirdpartyGeneration=%1 @@ -104,6 +104,7 @@ echo ITKSRCDIR=%ITKSRCDIR% echo VTKSRCDIR=%VTKSRCDIR% echo GDCMDIR=%GDCMSRCDIR% +echo ----------------------------------- echo ---End Setting Global Variables---- echo ----------------------------------- @@ -316,4 +317,5 @@ cd c:\ echo ----------------------------------- echo ---End of Installing Libraries----- echo ----------------------------------- -@echo on \ No newline at end of file + +exit /B \ No newline at end of file diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat index a0ed684..0598331 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat @@ -47,4 +47,5 @@ cmake -D CREA_LIBRARY_DLL_PATH:PATH=%thirdpartydllspath% CMakeCache.txt cmake CMakeCache.txt FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType% msbuild /p:Configuration=release PACKAGE.vcxproj -@echo on \ No newline at end of file + +exit /B \ No newline at end of file diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat index 886da92..d519734 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat @@ -46,4 +46,5 @@ cmake -D CREA_LIBRARY_SOURCE_PATH:PATH=%thirdpartylibpath% CMakeCache.txt cmake CMakeCache.txt FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType% msbuild /p:Configuration=release PACKAGE.vcxproj -@echo on \ No newline at end of file + +exit /B \ No newline at end of file diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat index a3f9140..2afc088 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat @@ -164,4 +164,6 @@ copy /V /Y %GDCMINSTALLDIR%\bin\*.exe %creaThirdPartydlls% copy /V /Y %GDCMINSTALLDIR%\bin\*.dll %creaThirdPartydlls% echo ----------------------------------- echo ------End of Moving Dlls----------- -echo ----------------------------------- \ No newline at end of file +echo ----------------------------------- + +exit /B \ No newline at end of file diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat index a6988f9..7204654 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat @@ -360,4 +360,6 @@ XCOPY %miktex%\* %creaThirdPartyLibraries%\%miktexAux% /s /i echo ----------------------------------- echo -----End of Moving Libraries------- -echo ----------------------------------- \ No newline at end of file +echo ----------------------------------- + +exit /B \ No newline at end of file