X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2Fmake-install.sh;h=848ba4d15caea05745719dbb5e20e81f9770ce0e;hb=6fc178d9ca1829f744c17e11e58d8ae75fc560d0;hp=bda80a3adbdabb4cfe9d53f8845689b8a4558991;hpb=28047d3a73e97e16c53ca5092d959824b3758dcd;p=creaToolsTools.git

diff --git a/Install/scripts/make-install.sh b/Install/scripts/make-install.sh
index bda80a3..848ba4d 100644
--- a/Install/scripts/make-install.sh
+++ b/Install/scripts/make-install.sh
@@ -2,6 +2,8 @@
 
 if [ $# = 0 ]
 then
+
+echo "Run it as 'root':"
 echo "Use it as :"
 echo "sh make-install.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <installPrefix> <buildType> <GDCM Version>"
 echo "with 'installPrefix' : /usr/local or <directory where you want to generate>/creatools_install"
@@ -37,6 +39,7 @@ fi
 #allow user to choose to generate the doc or not
 
 generationdir=$1
+docGeneration=$2
 cvsUserName=$3
 installPrefix=$4
 buildType=$5
@@ -74,7 +77,34 @@ cd $generationdir
 
 start_point=0
 
+# --------------------------------
+#         start_point = 1 : remove everything hat was installed before
+#---------------------------------
+if [ $start_point -le 1 ]
+then
+# the following stupid test is used at debug time; Please don't remove!
+#if [ true = false ]
+if [ true = true ]
+then
 
+  rm -rf creatools_install/lib/creatools
+  rm -rf creatools_install/lib64/creatools
+  rm -rf creatools_install/bin/bb*
+  rm -rf creatools_install/bin/crea*
+  rm -rf creatools_install/include/bb*
+  rm -rf creatools_install/include/crea*
+  rm -rf creatools_install/share/bb*
+  rm -rf creatools_install/share/crea*
+
+#this is for the old versions EED
+  rm -rf creatools_install/lib/crea*
+  rm -rf creatools_install/lib/libbb*
+  rm -rf creatools_install/lib/libcrea*
+  rm -rf creatools_install/lib64/crea*
+  rm -rf creatools_install/lib64/libbb*
+  rm -rf creatools_install/lib64/libcrea*
+fi
+fi
 
 
 cd $scriptDir
@@ -90,7 +120,7 @@ then
 #if [ true = false ]
 if [ true = true ]
 then
- sh compilemod.sh     	$buildType   $creasource $generationdir  
+ sh installmod.sh     	$buildType   $creasource $generationdir  
 
 fi
 fi
@@ -109,7 +139,7 @@ then
 if [ true = true ]
 then
 # BBTK
- sh compilemod.sh	$buildType $bbtksource $generationdir 
+ sh installmod.sh	$buildType $bbtksource $generationdir 
 fi
 fi
  bbtkdll=$generationdir/creatools_bin/bbtkBin
@@ -126,7 +156,7 @@ then
 if [ true = true ]
 then
 # creaMaracasVisu
- sh compilemod.sh           	$buildType $creamaracassource $generationdir 
+ sh installmod.sh           	$buildType $creamaracassource $generationdir 
 fi
 fi
  creamaracasdll=$generationdir/creatools_bin/creamaracasBin
@@ -143,7 +173,7 @@ then
 if [ true = true ]
 then
 # creaEnvironment
- sh compilemod.sh $buildType    $creaenvironmentsource $generationdir
+ sh installmod.sh $buildType    $creaenvironmentsource $generationdir
 fi
 fi
  creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin
@@ -160,7 +190,7 @@ then
 if [ true = true ]
 then
 # creaBruker
- sh compilemod.sh $buildType    $creabrukersource  $generationdir
+ sh installmod.sh $buildType    $creabrukersource  $generationdir
  echo generationdir 
 fi
 fi
@@ -178,7 +208,7 @@ then
 if [ true = true ]
 then
 # creaImageIO
- sh compilemod.sh 		$buildType $creaimagesource $generationdir
+ sh installmod.sh 		$buildType $creaimagesource $generationdir
 fi
 fi
  creaimagedll=$generationdir/creatools_bin/creaimageBin
@@ -195,7 +225,7 @@ then
 if [ true = true ]
 then
 # creaContours
- sh compilemod.sh 		$buildType $creacontourssource $generationdir
+ sh installmod.sh 		$buildType $creacontourssource $generationdir
 fi
 fi
 # creacontourdll=$generationdir/creatools_bin/creacontoursBin
@@ -211,7 +241,7 @@ then
 #if [ true = false ]
 if [ true = true ]
 then
- sh compilemod.sh	 		$buildType $crearigidregistrationssource $generationdir
+ sh installmod.sh	 		$buildType $crearigidregistrationssource $generationdir
 fi
 fi
 # crearigidregistrationdll=$generationdir/creatools_bin/crearigidregistrationBin
@@ -228,7 +258,7 @@ then
 if [ true = true ]
 then
 # bbtkGEditor
- sh compilemod.sh 		$buildType $bbtkgeditorsource $generationdir
+ sh installmod.sh 		$buildType $bbtkgeditorsource $generationdir
 fi
 fi
 # bbtkgeditordll=$generationdir/creatools_bin/bbtkgeditorBin
@@ -245,7 +275,7 @@ then
 if [ true = true ]
 then
 # creaTools
- sh compilemod.sh 		   $buildType $creatoolssource $generationdir
+ sh installmod.sh 		   $buildType $creatoolssource $generationdir
 fi
 fi
 
@@ -255,19 +285,19 @@ fi
 
 
 CREATOOLS_INSTALL_DIR=$installPrefix
-sudo rm        $CREATOOLS_INSTALL_DIR/share/creatools_base_library_config.sh
-sudo touch     $CREATOOLS_INSTALL_DIR/share/creatools_base_library_config.sh
-sudo chmod 666 $CREATOOLS_INSTALL_DIR/share/creatools_base_library_config.sh
+rm        $CREATOOLS_INSTALL_DIR/share/creatools_base_library_config.sh
+touch     $CREATOOLS_INSTALL_DIR/share/creatools_base_library_config.sh
+chmod 666 $CREATOOLS_INSTALL_DIR/share/creatools_base_library_config.sh
 
 #######################################
 
-sudo touch     $installPrefix/share/creatools_base_library_config.sh
-sudo chmod 666 $installPrefix/share/creatools_base_library_config.sh
+touch     $installPrefix/share/creatools_base_library_config.sh
+chmod 666 $installPrefix/share/creatools_base_library_config.sh
 
 
-sudo echo export PATH='$'PATH:$installPrefix/bin                                  >> $installPrefix/share/creatools_base_library_config.sh
-sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools >> $installPrefix/share/creatools_base_library_config.sh
-sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh
+echo export PATH='$'PATH:$installPrefix/bin                                   >> $installPrefix/share/creatools_base_library_config.sh
+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
 
 #  modify .bashrc
 # - remove line 'sh $installPrefix/creatools_install/share/creatools_base_party_libraries_config.sh' if any (with accurate value for ???)