From: Eduardo Davila Date: Sat, 16 Oct 2010 18:42:42 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: Creatools2-0-3.creaToolsTools2-0-3.17Feb2011~121 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=350ece6ac0f0307f45cb797b3c32eab9317a4bd0;p=creaToolsTools.git *** empty log message *** --- diff --git a/Install/Readme.txt b/Install/Readme.txt index fdbc698..1a4a6f6 100644 --- a/Install/Readme.txt +++ b/Install/Readme.txt @@ -10,14 +10,12 @@ as follows : -- creatools.sh --------------------- creatoolsGeneration= installPrefix= or -vtkDir= ex : /usr/lib64/vtk-5.4/ or /usr/lib/vtk-5.4/, ... cvsUser= docGeneration= let it to OFF! buildType= -archi=<32|64> according to your processor #sudo pwd cd scripts -sh All.sh $creatoolsGeneration $docGeneration $cvsUser $vtkDir $installPrefix $buildType $archi +sh All.sh $creatoolsGeneration $docGeneration $cvsUser $installPrefix $buildType cd .. ----------------------- diff --git a/Install/creatools.sh_TEMPLATE b/Install/creatools.sh_TEMPLATE index 8e036f2..c85b0ad 100644 --- a/Install/creatools.sh_TEMPLATE +++ b/Install/creatools.sh_TEMPLATE @@ -1,12 +1,10 @@ creatoolsGeneration= installPrefix= or -vtkDir= ex : /usr/lib64/vtk-5.4/ or /usr/lib/vtk-5.4/, ... cvsUser= docGeneration= let it to OFF! buildType= -archi=<32|64> (processor bits number) #sudo pwd cd scripts -sh All.sh $creatoolsGeneration $docGeneration $cvsUser $vtkDir $installPrefix $buildType $archi +sh All.sh $creatoolsGeneration $docGeneration $cvsUser $installPrefix $buildType cd .. diff --git a/Install/scripts/All.sh b/Install/scripts/All.sh index ce0ed2c..433a5ec 100644 --- a/Install/scripts/All.sh +++ b/Install/scripts/All.sh @@ -3,9 +3,9 @@ if [ $# = 0 ] then echo "Use it as :" -echo "sh All.sh " +echo "sh All.sh " echo " " -echo "ex : sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInstallDirectory 32" +echo "ex : sh All.sh /tmp/gendir OFF jpr /home/jpr/myInstallDirectory Debug" exit 0 fi @@ -18,12 +18,13 @@ echo $3 echo $4 echo $5 echo $6 -echo $7 echo "----------" -if [ $# != 7 ] +if [ $# != 5 ] then -echo "use it as sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInstallDirectory Release 32" +echo "sh All.sh " +echo " " +echo "ex : sh All.sh /tmp/gendir OFF jpr /home/jpr/myInstallDirectory Debug" exit 0 fi @@ -34,9 +35,8 @@ fi generationdir=$1 cvsUserName=$3 -VTKdir=$4 -installPrefix=$5 -buildtype=$6 +installPrefix=$4 +buildType=$5 scriptDir=$PWD echo scriptDir @@ -60,8 +60,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 @@ -75,7 +75,6 @@ rm -rf creatools_bin/bbtkGEditorBin 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 @@ -86,68 +85,54 @@ 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 # CREA -#if [ true = false ] -#then - sh cmakemod.sh $creasource $generationdir $VTKdir $installPrefix $buildType - sh creaVariables.sh $creasource $generationdir $docgeneration - sh compilemod.sh $buildtype $creasource $generationdir - echo " ---------------after compilemod -------------------------" - pwd - sh ctestmod.sh $creasource $generationdir -#fi - +if [ true = false ] +then + sh cmakemod.sh $creasource $generationdir $installPrefix $buildType + sh creaVariables.sh $creasource $generationdir $docgeneration + sh compilemod.sh $buildType $creasource $generationdir + sh ctestmod.sh $creasource $generationdir +fi creadll=$generationdir/creatools_bin/creaBin LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH -# echo "=in All.sh, out of crea ============================================================================ $LD_LIBRARY_PATH" - - -#if [ true = false ] -#then +if [ true = true ] +then # BBTK - sh cmakemod.sh $bbtksource $generationdir $VTKdir $installPrefix $buildType -# echo "============================BBTK out of cmakemod " - - sh bbtkVariables.sh $bbtksource $generationdir $docgeneration -# echo "============================BBTK out of bbtkVariables " - - sh compilemod.sh $buildtype $bbtksource $generationdir - echo "============================BBTK out of compilemod " - - sh ctestmod.sh $bbtksource $generationdir -#fi - + sh cmakemod.sh $bbtksource $generationdir $installPrefix $buildType + sh bbtkVariables.sh $bbtksource $generationdir $docgeneration + sh compilemod.sh $buildType $bbtksource $generationdir + sh ctestmod.sh $bbtksource $generationdir +fi bbtkdll=$generationdir/creatools_bin/bbtkBin LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH - #if [ true = false ] #then creaMaracasVisu -# echo "========================================================================================start creaMaracasVisu " - sh cmakemod.sh $creamaracassource $generationdir $VTKdir $installPrefix $buildType -# echo "=======================================================================================creaMaracasVisu out of cmakemod " - - sh creaMaracasVariables.sh $creamaracassource $generationdir $docgeneration - sh compilemod.sh $buildtype $creamaracassource $generationdir - - sh ctestmod.sh $creamaracassource $generationdir + sh cmakemod.sh $creamaracassource $generationdir $installPrefix $buildType + sh creaMaracasVariables.sh $creamaracassource $generationdir $docgeneration + sh compilemod.sh $buildType $creamaracassource $generationdir + sh ctestmod.sh $creamaracassource $generationdir #fi creamaracasdll=$generationdir/creatools_bin/creamaracasBin LD_LIBRARY_PATH=$creamaracasdll:$LD_LIBRARY_PATH + +exit 0 + + #if [ true = false ] #then # creaEnvironment - sh cmakemod.sh $creaenvironmentsource $generationdir $VTKdir $installPrefix $buildType + sh cmakemod.sh $creaenvironmentsource $generationdir $installPrefix $buildType sh creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration - sh compilemod.sh $buildtype $creaenvironmentsource $generationdir + sh compilemod.sh $buildType $creaenvironmentsource $generationdir sh ctestmod.sh $creaenvironmentsource $generationdir #fi creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin @@ -156,53 +141,50 @@ cd $scriptDir #if [ true = false ] #then # creaBruker - sh cmakemod.sh $creabrukersource $generationdir $VTKdir $installPrefix $buildType - sh creaBrukerVariables.sh $creabrukersource $generationdir $docgeneration -#fi - - sh compilemod.sh $buildtype $creabrukersource $generationdir -# echo "creaBruker : out of compilemod.sh; stop here, now!" -# exit 0 + sh cmakemod.sh $creabrukersource $generationdir $installPrefix $buildType + sh creaBrukerVariables.sh $creabrukersource $generationdir $docgeneration + sh compilemod.sh $buildType $creabrukersource $generationdir sh ctestmod.sh $creabrukersource $creabinfolder +#fi creabrukerdll=$generationdir/creatools_bin/creabrukerBin LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_PATH # creaImageIO - sh cmakemod.sh $creaimagesource $generationdir $VTKdir $installPrefix $buildType - sh creaImageIOVariables.sh $creaimagesource $generationdir $docgeneration - sh compilemod.sh $buildtype $creaimagesource $generationdir - sh ctestmod.sh $creaimagesource $generationdir + sh cmakemod.sh $creaimagesource $generationdir $installPrefix $buildType + sh creaImageIOVariables.sh $creaimagesource $generationdir $docgeneration + sh compilemod.sh $buildType $creaimagesource $generationdir + sh ctestmod.sh $creaimagesource $generationdir creaimagedll=$generationdir/creatools_bin/creaimageBin LD_LIBRARY_PATH=$creaimagedll:$LD_LIBRARY_PATH # creaContours - sh cmakemod.sh $creacontourssource $generationdir $VTKdir $installPrefix $buildType - sh creaContoursVariables.sh $creacontourssource $generationdir $docgeneration - sh compilemod.sh $buildtype $creacontourssource $generationdir - sh ctestmod.sh $creacontourssource $generationdir + sh cmakemod.sh $creacontourssource $generationdir $installPrefix $buildType + sh creaContoursVariables.sh $creacontourssource $generationdir $docgeneration + sh compilemod.sh $buildType $creacontourssource $generationdir + sh ctestmod.sh $creacontourssource $generationdir # creacontourdll=$generationdir/creatools_bin/creacontoursBin # LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH # creaRigidRegistration - sh cmakemod.sh $crearigidregistrationssource $generationdir $VTKdir $installPrefix $buildType - sh creaRigidRegistrationVariables.sh $crearigidregistrationssource $generationdir $docgeneration - sh compilemod.sh $buildtype $crearigidregistrationssource $generationdir - sh ctestmod.sh $crearigidregistrationssource $generationdir + sh cmakemod.sh $crearigidregistrationssource $generationdir $installPrefix $buildType + sh creaRigidRegistrationVariables.sh $crearigidregistrationssource $generationdir $docgeneration + sh compilemod.sh $buildType $crearigidregistrationssource $generationdir + sh ctestmod.sh $crearigidregistrationssource $generationdir # crearigidregistrationdll=$generationdir/creatools_bin/crearigidregistrationBin # LD_LIBRARY_PATH=$crearigidregistrationdll:$LD_LIBRARY_PATH # bbtkGEditor - sh cmakemod.sh $bbtkgeditorsource $generationdir $VTKdir $installPrefix $buildType - sh bbtkGEditorVariables.sh $bbtkgeditorsource $generationdir $docgeneration - sh compilemod.sh $buildtype $bbtkgeditorsource $generationdir - sh ctestmod.sh $bbtkgeditorsource $generationdir + sh cmakemod.sh $bbtkgeditorsource $generationdir $installPrefix $buildType + sh bbtkGEditorVariables.sh $bbtkgeditorsource $generationdir $docgeneration + sh compilemod.sh $buildType $bbtkgeditorsource $generationdir + sh ctestmod.sh $bbtkgeditorsource $generationdir # bbtkgeditordll=$generationdir/creatools_bin/bbtkgeditorBin # LD_LIBRARY_PATH=$bbtkgeditordll:$LD_LIBRARY_PATH # creaTools - sh cmakemod.sh $creatoolssource $generationdir $VTKdir $installPrefix $buildType + sh cmakemod.sh $creatoolssource $generationdir $installPrefix $buildType sh creaToolsVariables.sh $creatoolssource $generationdir $docgeneration - sh compilemod.sh $buildtype $creatoolssource $generationdir + sh compilemod.sh $buildType $creatoolssource $generationdir # sh ctestmod.sh $creatoolsbinary $generationdir # creatoolsdll=$generationdir/creatools_bin/creatoolsBin # LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH diff --git a/Install/scripts/cmakemod.sh b/Install/scripts/cmakemod.sh index b9a0b45..45f89f9 100644 --- a/Install/scripts/cmakemod.sh +++ b/Install/scripts/cmakemod.sh @@ -1,28 +1,18 @@ #!/bin/sh currentdir=$2 -VTKdir=$3 -installPrefix=$4 +installPrefix=$3 dirInstall=$currentdir/creatools_bin/$1Bin -installPrefix=$4 -buildType=$5 -archi=$6 +buildType=$4 -if [ buildType = "Debug" ] + +if [ $buildType = "Debug" ] then debug="ON" else debug="OFF" fi -install_lib_dir=$installPrefix/ -if [ archi = 64 ] -then -install_lib_dir=$installPrefix/lib64 -else -install_lib_dir=$installPrefix/lib -fi - echo dirInstall echo $dirInstall @@ -31,16 +21,18 @@ cd $dirInstall echo -H$currentdir/creatools_source/$1 echo -B$dirInstall/ -##cmake -G"CodeBlocks - Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/ -cmake -G"Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/ +## cmake -G"Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/ +cmake -G"CodeBlocks - Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/ -cmake -D BUILD_ALL:BOOL=ON -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_LIBDIR:PATH=$install_lib_dir CMakeCache.txt +cmake -D BUILD_ALL:BOOL=ON -D INCLUDE_CTEST:BOOL=ON -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt # the following line is the right one! -#cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin CMakeCache.txt +#cmake -D INCLUDE_CTEST:BOOL=ON CMakeCache.txt # This one : only for misinstalled vtk: # modify VTK_DIR:PATH=, acording to your own computer -cmake -D INCLUDE_CTEST:BOOL=ON -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=$VTKdir -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt +##cmake -D INCLUDE_CTEST:BOOL=ON -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=$VTKdir -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt cd .. + + diff --git a/Install/scripts/creaVariables.sh b/Install/scripts/creaVariables.sh index aeb4229..01b3a4f 100644 --- a/Install/scripts/creaVariables.sh +++ b/Install/scripts/creaVariables.sh @@ -9,4 +9,7 @@ binfolder=$2/creatools_bin/$1Bin cd $binfolder cmake -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt +cmake CMakeCache.txt +cmake CMakeCache.txt + cd ..