From: Eduardo Davila Date: Thu, 7 Oct 2010 11:45:46 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~3 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c101ad5b4822a1de8a54fa11027e6ee6ce7baddc;p=creaToolsTools.git *** empty log message *** --- diff --git a/Install/creatools.sh_TEMPLATE b/Install/creatools.sh_TEMPLATE index 5ed3e4c..4c26958 100644 --- a/Install/creatools.sh_TEMPLATE +++ b/Install/creatools.sh_TEMPLATE @@ -8,5 +8,4 @@ buildType= sudo pwd cd scripts sh All.sh $creatoolsGeneration $docGeneration $cvsUser $vtkDir $installPrefix $buildType -cd .. - +cd .. diff --git a/Install/scripts/All.sh b/Install/scripts/All.sh index 6369119..0f00310 100644 --- a/Install/scripts/All.sh +++ b/Install/scripts/All.sh @@ -37,7 +37,7 @@ VTKdir=$4 installPrefix=$5 buildtype=$6 -scriptDir=$PWD/scripts +scriptDir=$PWD echo scriptDir echo $scriptDir @@ -59,8 +59,8 @@ mkdir $generationdir/creatools_bin cd $generationdir # the following stupid test is used at debug time; Please don't remove! -if [ true = false ] -then +#if [ true = false ] +#then rm -rf creatools_bin/creaBin rm -rf creatools_bin/bbtkBin @@ -71,9 +71,10 @@ rm -rf creatools_bin/creaImageIOBin rm -rf creatools_bin/creaContoursBin rm -rf creatools_bin/creaRigidRegistrationBin rm -rf creatools_bin/bbtkGEditorBin -rm -rf /creatools_bin/creaToolsBin +rm -rf creatools_bin/creaToolsBin sh $scriptDir/cvscheckout.sh $creasource $generationdir $cvsUserName + sh $scriptDir/cvscheckout.sh $bbtksource $generationdir $cvsUserName sh $scriptDir/cvscheckout.sh $creamaracassource $generationdir $cvsUserName sh $scriptDir/cvscheckout.sh $creaenvironmentsource $generationdir $cvsUserName @@ -84,7 +85,7 @@ sh $scriptDir/cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUs sh $scriptDir/cvscheckout.sh $bbtkgeditorsource $generationdir $cvsUserName sh $scriptDir/cvscheckout.sh $creatoolssource $generationdir $cvsUserName -fi +#fi cd $scriptDir