From a5fce6cfe871e7dee66e6e7c064ef9e632a5c192 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Sat, 5 Mar 2011 10:01:34 +0000 Subject: [PATCH] Install creatools , NO root. Last stage (?) --- Linux/menu.sh | 3 +- Linux/scripts/CreaTools-compile.sh | 24 +++++++++------- Linux/scripts/CreaTools-install.sh | 46 ++++++++++++++++++++---------- Linux/scripts/installmod.sh | 16 +++++++++-- 4 files changed, 59 insertions(+), 30 deletions(-) diff --git a/Linux/menu.sh b/Linux/menu.sh index fa20def..486e887 100644 --- a/Linux/menu.sh +++ b/Linux/menu.sh @@ -21,8 +21,6 @@ do echo " Get the 'CreaTools' source files :.2 (CVS : as user!)" echo " Compile the CreaTools :..........3 " # Install creatools as user (no longer as root) // JPR 2/5/2011 -# echo " Install the CreaTools :..........4 (as root)" -# echo " Uninstall the CreaTools :..........5 (as root)" echo " Install the CreaTools :..........4 " echo " Uninstall the CreaTools :..........5 " echo @@ -387,6 +385,7 @@ do # fi echo "========================= 4" + bash scripts/CreaTools-install.sh diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh index 2a8f9a3..1a4bbf0 100644 --- a/Linux/scripts/CreaTools-compile.sh +++ b/Linux/scripts/CreaTools-compile.sh @@ -27,7 +27,9 @@ fi echo $docgeneration echo --installPrefix-- echo $installPrefix - echo --buildType-- + echo --installPrefixThird-- + echo $installPrefixThird + echo --buildType-- echo $buildType echo --gdcmVersion-- echo $gdcmVersion @@ -113,7 +115,7 @@ fi fi creadll=$generationdir/creatools_bin/creaBin LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH - + export crea_DIR=$generationdir/creatools_bin/creaBin # ------------------------- # start_point = 3 : BBTK @@ -134,7 +136,7 @@ fi fi bbtkdll=$generationdir/creatools_bin/bbtkBin LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH - + export bbtk_DIR=$generationdir/creatools_bin/bbtkBin # ------------------------- # start_point = 4 : creaMaracasVisu @@ -152,9 +154,9 @@ then bash $scriptDir/ctestmod.sh $creamaracassource $generationdir fi fi - creamaracasdll=$generationdir/creatools_bin/creamaracasBin + creamaracasdll=$generationdir/creatools_bin/creaMaracasVisuBin LD_LIBRARY_PATH=$creamaracasdll:$LD_LIBRARY_PATH - + export creaMaracasVisu_DIR=$generationdir/creatools_bin/creaMaracasVisuBin # ------------------------- # start_point = 5 : creaEnvironment @@ -174,7 +176,7 @@ fi fi creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin LD_LIBRARY_PATH=$creaenvironmentdll:$LD_LIBRARY_PATH - + export creaEnvironment_DIR=$generationdir/creatools_bin/creaEnvironmentBin # ------------------------- # start_point = 6 : creaBruker @@ -194,7 +196,7 @@ fi fi creabrukerdll=$generationdir/creatools_bin/creabrukerBin LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_PATH - + export creaBruker_DIR=$generationdir/creatools_bin/creaBrukerBin # ------------------------- # start_point = 7 : creaImageIO @@ -214,7 +216,7 @@ fi fi creaimagedll=$generationdir/creatools_bin/creaimageBin LD_LIBRARY_PATH=$creaimagedll:$LD_LIBRARY_PATH - +export creaImageIO_DIR=$generationdir/creatools_bin/creaImageIOBin # ------------------------- # start_point = 8 : creaContour @@ -232,9 +234,9 @@ then bash $scriptDir/ctestmod.sh $creacontourssource $generationdir fi fi -# creacontourdll=$generationdir/creatools_bin/creacontoursBin -# LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH - + creacontourdll=$generationdir/creatools_bin/creacontoursBin + LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH + export creaContours_DIR=$generationdir/creatools_bin/creaContoursBin # ------------------------- # start_point = 9 : creaRigidRegistration diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index 60156ab..d5b107f 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -1,5 +1,6 @@ #!/bin/bash +# JPR 2/5/2011 #if [ $UID = 0 ] #then # Set all local variables @@ -7,17 +8,9 @@ source $PWD/scripts/CreaTools-names.sh cd $scriptDir - bash installmod.sh $buildType $creasource $generationdir - bash installmod.sh $buildType $bbtksource $generationdir - bash installmod.sh $buildType $creamaracassource $generationdir - bash installmod.sh $buildType $creaenvironmentsource $generationdir - bash installmod.sh $buildType $creabrukersource $generationdir - bash installmod.sh $buildType $creaimagesource $generationdir - bash installmod.sh $buildType $creacontourssource $generationdir - bash installmod.sh $buildType $crearigidregistrationssource $generationdir - bash installmod.sh $buildType $bbtkgeditorsource $generationdir - bash installmod.sh $buildType $creatoolssource $generationdir - + +#create creatools_base_library_config.sh at the very begining, so we can write "export xxx_BIN=..." inside installmod.sh. JPRx 3 mars 2011 + if [ -f $installPrefix/share/creatools_base_library_config.sh ] then rm $installPrefix/share/creatools_base_library_config.sh @@ -29,25 +22,48 @@ echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools >> $installPrefix/share/creatools_base_library_config.sh echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh -# Install creatools as user (no longer as root) // JPR 2/5/2011 +# Install creatools as user (no longer as root) // JPR 2/5/2011 + # if [ ! -f /etc/bashrc ] # then # export ETC_BASHRC="/etc/bash.bashrc" # else # export ETC_BASHRC="/etc/bashrc" -# fi +# fi + export ETC_BASHRC=$HOME/.bashrc - # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_librariy_config.sh' if any + # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh' if any sed -i -e '/.*creatools_base_library_config.*/ d' $ETC_BASHRC sed -i -e '/installPrefixtmp*/ d' $ETC_BASHRC + + # JPR 2/5/2011 # modify /etc/bashrc (we cannot modify .bashrc, since we switched as root) - # - add line 'bash $installPrefix/creatools_install/share/creatools_base_librariy_config.sh' + # - add line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh' + + bash installmod.sh $buildType $creasource $generationdir $installPrefix + bash installmod.sh $buildType $bbtksource $generationdir $installPrefix + bash installmod.sh $buildType $creamaracassource $generationdir $installPrefix + bash installmod.sh $buildType $creaenvironmentsource $generationdir $installPrefix + bash installmod.sh $buildType $creabrukersource $generationdir $installPrefix + bash installmod.sh $buildType $creaimagesource $generationdir $installPrefix + bash installmod.sh $buildType $creacontourssource $generationdir $installPrefix + bash installmod.sh $buildType $crearigidregistrationssource $generationdir $installPrefix + bash installmod.sh $buildType $bbtkgeditorsource $generationdir $installPrefix + bash installmod.sh $buildType $creatoolssource $generationdir $installPrefix echo installPrefixtmp=$installPrefix >> $ETC_BASHRC echo '[ -f "$installPrefixtmp/share/creatools_base_library_config.sh" ] && source $installPrefixtmp/share/creatools_base_library_config.sh' >> $ETC_BASHRC +source $installPrefix/share/creatools_base_library_config.sh +echo "===================================================" +echo " Regenerate Package doc" +$installPrefix/bin/bbRegeneratePackageDoc -a -q +echo " Regenerate Boxes list" +$installPrefix/bin/bbRegenerateBoxesLists -q +echo "===================================================" + # JPR 2/5/2011 #else # echo # echo "..ERROR.." diff --git a/Linux/scripts/installmod.sh b/Linux/scripts/installmod.sh index f9734a6..9646409 100644 --- a/Linux/scripts/installmod.sh +++ b/Linux/scripts/installmod.sh @@ -1,7 +1,7 @@ # $1 : useless for Linux (Release/Debug) # $2 : name of source ex : crea # $3 : generationdir ex : /tmp/myGenerationDir - +# $4 : installPrefix cd $3/creatools_bin/$2Bin echo echo @@ -10,11 +10,23 @@ echo "------------------------------------------in installmod-- $2 ------------" echo $1 echo $2 echo $3 - +echo $4 +installPrefix=$4 # We install, now pwd make install + +if [ -e $installPrefix/lib64 ] +then + echo export $2_DIR=$installPrefix/lib64/creatools/$2 >> $installPrefix/share/creatools_base_library_config.sh +fi +if [ -e $installPrefix/lib ] +then + echo "export $2_DIR=$installPrefix/lib/creatools/$2" >> $installPrefix/share/creatools_base_library_config.sh +else + echo "============================= NEITHER $installPrefix/lib64 NOR installPrefix/lib EXIST ?!?" +fi cd ../.. pwd -- 2.45.1