]> Creatis software - creaToolsTools.git/commitdiff
DFCH: Some bugs Solved!!
authorDiego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Mon, 28 Nov 2011 07:55:40 +0000 (07:55 +0000)
committerDiego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Mon, 28 Nov 2011 07:55:40 +0000 (07:55 +0000)
Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
Install_ThirdParty/install_thirdparty.bat_TEMPLATE
Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE
Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE
Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE
Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE
Install_ThirdParty/scripts/install_thirdparty_all.bat
Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
Install_ThirdParty/scripts/move_thirdparty_dlls.bat
Install_ThirdParty/scripts/move_thirdparty_libraries.bat

index 60e8098..01faf82 100644 (file)
@@ -1,15 +1,50 @@
+@echo off
+
+echo -----------------------------------
+echo ---Setting Environment Variables---
+echo -----------------------------------
+
 set thirdpartyGeneration=<directory where you want to generate>
 set buildType=<debug|release|RelWithDebInfo>
 
+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
index 7f940e7..5e6d1d0 100644 (file)
@@ -1,8 +1,36 @@
+@echo off
+
+echo -----------------------------------
+echo ---Setting Environment Variables---
+echo -----------------------------------
 
 set thirdpartyGeneration=<directory where you want to generate>
 set buildType=<debug|release|RelWithDebInfo>
 
+
+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
index 8e1525c..747e7c2 100644 (file)
@@ -1,6 +1,32 @@
+@echo off
+
+echo -----------------------------------
+echo ---Setting Environment Variables---
+echo -----------------------------------
 
 set thirdpartyGeneration=<directory where the generation was made>
 
+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
index 4bf4111..7cf1ccb 100644 (file)
@@ -1,6 +1,32 @@
+@echo off
+
+echo -----------------------------------
+echo ---Setting Environment Variables---
+echo -----------------------------------
 
 set thirdpartyGeneration=<directory where the generation was made>
 
+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
index 3754399..962fe23 100644 (file)
@@ -1,7 +1,33 @@
+@echo off
+
+echo -----------------------------------
+echo ---Setting Environment Variables---
+echo -----------------------------------
 
 set thirdpartyGeneration=<directory where the generation was made>
 
+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
+
index b01123f..cb7329c 100644 (file)
@@ -1,6 +1,32 @@
+@echo off
+
+echo -----------------------------------
+echo ---Setting Environment Variables---
+echo -----------------------------------
 
 set thirdpartyGeneration=<directory where the generation was made>
 
+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
index cb2ca2f..2217d22 100644 (file)
@@ -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
index a0ed684..0598331 100644 (file)
@@ -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
index 886da92..d519734 100644 (file)
@@ -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
index a3f9140..2afc088 100644 (file)
@@ -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
index a6988f9..7204654 100644 (file)
@@ -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