X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Install_ThirdParty%2Fscripts%2Fmove_thirdparty_libraries.bat;h=720465479bab7ebdef510b4ada557b44b70e899d;hb=7eb479d330870bf235601d2474a4f77e0a353d72;hp=487a2788d3e6f52534fbd0095ff16b7ea5c8013d;hpb=a37d18909c36e1bcd3427106fa70b91dd5b6c108;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
index 487a278..7204654 100644
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -1,5 +1,8 @@
 @echo off
 echo -----------------------------------
+echo --------Moving Libraries-----------
+echo -----------------------------------
+echo -----------------------------------
 echo ------Asking Architecture----------
 echo -----------------------------------
 if %PROCESSOR_ARCHITECTURE%==x86 (
@@ -45,10 +48,18 @@ set VTKINSTALLDIR=%installpath%\%vtk%
 set GDCMINSTALLDIR=%installpath%\%gdcm%
 set TTHDIR=%sourcepath%\%tth%
 
-if not exist %miktex% set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe"
 if not exist %miktex% (
+ set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe"
+ if not exist %miktex% (
   echo ERROR!!! MiKTex has not been found in the system
   exit
+ )
+ else (
+   set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9"
+ )
+)
+else (
+set miktex="%ProgramFilesPath_x86%\MiKTeX 2.9"
 )
 
 echo -----------------------------------
@@ -56,6 +67,7 @@ echo Environment variables Configuration
 echo -----------------------------------
 echo ThirdpartyGeneration=%thirdpartyGeneration%
 echo MikTex=%miktex%
+echo miktexAux=%miktexAux%
 echo InstallPath=%installpath%
 echo BinPath=%binpath%
 echo SourcePath=%sourcepath%
@@ -74,6 +86,8 @@ echo XERCESDIR=%XERCESDIR%
 echo ITKSRCDIR=%ITKSRCDIR%
 echo VTKSRCDIR=%VTKSRCDIR%
 
+rmdir %creaThirdPartyLibraries% /s /q
+
 mkdir %creaThirdPartyLibraries%
 
 echo -----------------------------------
@@ -336,9 +350,16 @@ echo -------------TTH-------------------
 echo -----------------------------------
 mkdir %creaThirdPartyLibraries%\tth
 XCOPY %TTHDIR%\* %creaThirdPartyLibraries%\%tth% /s /i
+
 echo -----------------------------------
 echo -------------MiKText---------------
 echo -----------------------------------
 mkdir %creaThirdPartyLibraries%\%miktexAux%
 
 XCOPY %miktex%\* %creaThirdPartyLibraries%\%miktexAux% /s /i
+
+echo -----------------------------------
+echo -----End of Moving Libraries-------
+echo -----------------------------------
+
+exit /B
\ No newline at end of file