From: Eduardo Enrique Davila Serrano Date: Mon, 15 Jan 2024 14:43:32 +0000 (+0100) Subject: Clean code X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=541741cf0111f39796f315c8816bbaf7185ed253;p=creaToolsTools.git Clean code --- diff --git a/Install_mingw64/Install_CreaTools/scripts/All2.bat b/Install_mingw64/Install_CreaTools/scripts/All2.bat index 7139a5e..bbbeec0 100644 --- a/Install_mingw64/Install_CreaTools/scripts/All2.bat +++ b/Install_mingw64/Install_CreaTools/scripts/All2.bat @@ -73,7 +73,6 @@ start /B /wait %scriptsFolder%\bbtkGEditorInstall.bat echo call compile creaMinitools start /B /wait %scriptsFolder%\creaMinitoolsInstall.bat - echo THIS HAS TO BE THE LAST STEP... echo call compile creaTools start /B /wait %scriptsFolder%\creaToolsInstall.bat diff --git a/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat b/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat index f026a64..70ab930 100644 --- a/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat +++ b/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat @@ -31,9 +31,10 @@ echo Module Sources = %2 echo creatoolsGeneration = %3 echo Architecture found = %PROCESSOR_ARCHITECTURE% + ::if %PROCESSOR_ARCHITECTURE%==x86 ( :: set ProgramFilesPath_x86=%ProgramFiles% -: set "compilerVersion=Visual Studio 10" +:: set "compilerVersion=Visual Studio 10" ::) else ( :: set "ProgramFilesPath_x64=%ProgramFiles%" :: set "ProgramFilesPath_x86=%ProgramFiles(x86)%" diff --git a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat index 0ce7fbd..aacc100 100644 --- a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat +++ b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat @@ -28,12 +28,12 @@ call %baseFolder%\cleangeneral.bat %creatoolsGeneration% %installPrefix% echo downloading creatools software -::goto SkipEED1 -:SkipEED1 ::set creatoolsBranch=vtk8itk5wx3-mingw64 set creatoolsBranch=vtk9itk5wx3-macos +::goto SkipEED1 +:SkipEED1 echo echo tmp.sh > tmp.sh set creatoolsGeneration2=%creatoolsGeneration:\=/% @@ -41,13 +41,11 @@ echo mkdir %creatoolsGeneration2% >> tmp.sh echo mkdir %creatoolsGeneration2%/cs >> tmp.sh echo cd %creatoolsGeneration2%/cs >> tmp.sh - echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creasource% >> tmp.sh echo cd %creasource% >> tmp.sh echo git checkout %creatoolsBranch% >> tmp.sh echo cd .. >> tmp.sh - echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtksource% >> tmp.sh echo cd %bbtksource% >> tmp.sh echo git checkout %creatoolsBranch% >> tmp.sh @@ -98,14 +96,11 @@ echo cd %creaminitoolssource% >> tmp.sh echo git checkout %creatoolsBranch% >> tmp.sh echo cd .. >> tmp.sh - echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creatoolssource% >> tmp.sh echo cd %creatoolssource% >> tmp.sh echo git checkout %creatoolsBranch% >> tmp.sh echo cd .. >> tmp.sh - - echo call gitcall.bat "%cd%\tmp.sh" call gitcall.bat "%cd%\tmp.sh" diff --git a/Install_mingw64/Install_CreaTools/scripts/creaToolsVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaToolsVariables.bat index 30364cf..c6d3e2a 100644 --- a/Install_mingw64/Install_CreaTools/scripts/creaToolsVariables.bat +++ b/Install_mingw64/Install_CreaTools/scripts/creaToolsVariables.bat @@ -60,8 +60,6 @@ if %platforme%==Win32 ( ::cmake -D CREATOOLS_BUILDTYPE:STRING=%buildType% -D CREATOOLS_PLATFORM:STRING=%buildPlatform% CMakeCache.txt ::cmake -D CREATOOLS_SOURCE_PATH:PATH=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_install CMakeCache.txt - %cmakeBin% -D CREATOOLS_BUILDTYPE:STRING=%buildType% -D CREATOOLS_PLATFORM:STRING=%buildPlatform% CMakeCache.txt %cmakeBin% -D CREATOOLS_SOURCE_PATH:PATH=%creatoolsGeneration%\c_%buildtype%%platforme%\ci CMakeCache.txt -