From 6f22bd8b36c61e1c3d74a4d96e54f0036a398784 Mon Sep 17 00:00:00 2001 From: Claire Mouton Date: Wed, 6 Mar 2013 15:00:39 +0100 Subject: [PATCH] Bug #1928 Removed the gitusername from the Windows installation scripts. --- Install/creatools.bat_TEMPLATE | 3 +-- Install/scripts/All.bat | 7 +++---- Install/scripts/base/downloadSources.bat | 24 ++++++++++++------------ Install/scripts/base/gitclone.bat | 12 ++++++------ 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/Install/creatools.bat_TEMPLATE b/Install/creatools.bat_TEMPLATE index 9cd680c..4f0c6af 100644 --- a/Install/creatools.bat_TEMPLATE +++ b/Install/creatools.bat_TEMPLATE @@ -25,13 +25,12 @@ REM ------------------------------------------------------------------------ set creatoolsGeneration= set installPrefix=%creatoolsGeneration%\creatools_install set buildType= -set gitUser= set docGeneration= let it to OFF! ::Set the following line ON if you want to force x86 compilation set forcex86=OFF cd scripts -call All.bat %creatoolsGeneration% %docGeneration% %gitUser% %installPrefix% %buildType% %forcex86% +call All.bat %creatoolsGeneration% %docGeneration% %installPrefix% %buildType% %forcex86% cd .. pause exit diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat index 13443cf..c187125 100644 --- a/Install/scripts/All.bat +++ b/Install/scripts/All.bat @@ -25,10 +25,9 @@ REM ------------------------------------------------------------------------ set creatoolsGeneration=%1 set docgeneration=%2 -set gitUser=%3 -set installPrefix=%4 -set buildtype=%5 -set forcex86=%6 +set installPrefix=%3 +set buildtype=%4 +set forcex86=%5 set scriptsFolder=%cd% set logFolder=%creatoolsGeneration%\installLog diff --git a/Install/scripts/base/downloadSources.bat b/Install/scripts/base/downloadSources.bat index 357b8f9..2fc4f56 100644 --- a/Install/scripts/base/downloadSources.bat +++ b/Install/scripts/base/downloadSources.bat @@ -40,20 +40,20 @@ echo downloading creatools software :: call %baseFolder%\cvscheckout.bat %creatoolssource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 :: call %baseFolder%\cvscheckout.bat %creaminitoolssource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creasource% %gitUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %bbtksource% %gitUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creamaracassource% %gitUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creaenvironmentsource% %gitUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creabrukersource% %gitUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creaimagesource% %gitUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creacontourssource% %gitUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %crearigidregistrationssource% %gitUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %bbtkgeditorsource% %gitUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creatoolssource% %gitUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creaminitoolssource% %gitUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 + call %baseFolder%\gitclone.bat %creasource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 + call %baseFolder%\gitclone.bat %bbtksource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 + call %baseFolder%\gitclone.bat %creamaracassource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 + call %baseFolder%\gitclone.bat %creaenvironmentsource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 + call %baseFolder%\gitclone.bat %creabrukersource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 + call %baseFolder%\gitclone.bat %creaimagesource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 + call %baseFolder%\gitclone.bat %creacontourssource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 + call %baseFolder%\gitclone.bat %crearigidregistrationssource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 + call %baseFolder%\gitclone.bat %bbtkgeditorsource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 + call %baseFolder%\gitclone.bat %creatoolssource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 + call %baseFolder%\gitclone.bat %creaminitoolssource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 echo end of downloading creatools software exit - \ No newline at end of file + diff --git a/Install/scripts/base/gitclone.bat b/Install/scripts/base/gitclone.bat index 632ad54..ff07e13 100644 --- a/Install/scripts/base/gitclone.bat +++ b/Install/scripts/base/gitclone.bat @@ -24,14 +24,14 @@ REM ------------------------------------------------------------------------ @echo off echo ---------------------------- -echo -----cvscheckout.bat-------- +echo -----gitclone.bat----------- echo ---------------------------- echo creasourcefolder = %1 -echo cvsUser = %2 -echo creatoolsGeneration = %3 +REM echo cvsUser = %2 +echo creatoolsGeneration = %2 -mkdir %3\creatools_sources -cd %3\creatools_sources -::cvs -d :ssh:%2@cvs.creatis.insa-lyon.fr:/cvs/creatis checkout %1 +mkdir %2\creatools_sources +cd %2\creatools_sources +REM ::cvs -d :ssh:%2@cvs.creatis.insa-lyon.fr:/cvs/creatis checkout %1 git clone ssh://gitolite@git.creatis.insa-lyon.fr/%1 -- 2.45.0