#2493 creaToolsTools Feature New Normal - Prepare and Install binary CreaTools...

diff --git a/Linux/installscript b/Linux/installscript
index 836e55ecba78a77a7b0ada014b9cc5eca773824c..9c2ef2b2570bb93d6a159b9048ea09e95964fca9 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -427,8 +427,8 @@ if [ `checkVal $command all creatools creatools-install` == true ] ; then
     echo " "
     echo " "
     echo " "
-    echo "Close this window and continue...."
-    echo " "
+    echo "Open a new terminal to run creatools."
+    echo "(Close this window and continue....) "
     echo " "
     echo " "
     read -p "Press [Enter] key to continue..."

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index b06e86a2608c449b458812d3953d4b1abe5fd007..2b12aa41473a35cb2c320dfeead77474515ed2df 100644 (file)
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -29,12 +29,24 @@
 #then
   # Set all local variables
   source $PWD/scripts/CreaTools-configure.sh
- 
   if [ -e $generationdir ]
   then
-     fileTGZ=$generationdir/creaTools-Bin.tgz
-     tar -cvzf $fileTGZ $installPrefix $installPrefixThird
-    
+
+         cd $generationdir
+         source creatools_install/share/creatools/Version.sh 
+     fileTGZ=CreaTools-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-Linux.tgz
+
+     tar -cvzf $fileTGZ creatools_install thirdparty_install
+         scp $fileTGZ tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/$fileTGZ 
+
+
+         echo "wget http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/$fileTGZ" > creatools-DownloadLastVersion.sh 
+         echo "tar -xvzf $fileTGZ" >>  creatools-DownloadLastVersion.sh
+
+     scp creatools-DownloadLastVersion.sh tux.creatis.insa-lyon.fr:creatools/creaTools/creatools-DownloadLastVersion.sh 
+
+     echo ""
+     echo ""
      echo ""
      echo "Creation OK:"
      echo $fileTGZ

diff --git a/Linux/scripts/CreaTools-bashrc.sh b/Linux/scripts/CreaTools-bashrc.sh
new file mode 100644 (file)
index 0000000..09193ec
--- /dev/null
+++ b/Linux/scripts/CreaTools-bashrc.sh
@@ -0,0 +1,41 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+
+
+#!/bin/bash
+
+
+
+echo CreaTools-bashrc.sh
+echo $ETC_BASHRC
+echo $installPrefix
+
+  # - 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
+
+echo "===================================================in CreaTools-install.sh ETC_BASHRC : "  $ETC_BASHRC 
+echo installPrefixtmp=$installPrefix >> $ETC_BASHRC
+echo '[ -f "$installPrefixtmp/share/creatools/creatools_base_library_config.sh" ] &&  source $installPrefixtmp/share/creatools/creatools_base_library_config.sh $installPrefixtmp' >> $ETC_BASHRC 
+
+

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index cb415f2e21027ce7031e24644d45861dad248b0d..9260a64eb9b513dfbfa0a8d623aba51cb6fb0e9e 100644 (file)
--- a/Linux/scripts/CreaTools-install.sh
+++ b/Linux/scripts/CreaTools-install.sh
@@ -53,25 +53,15 @@
   
   cd $scriptDir
 
-  #create creatools_base_library_config.sh  at the very begining, so we can write "export xxx_BIN=..." inside installmod.sh. JPRx 3 mars 2011
-
-##EED  if [ -f $installPrefix/share/creatools_base_library_config.sh ]
-##EED  then
-##EED     rm        $installPrefix/share/creatools_base_library_config.sh
-##EED  fi
-##EED  touch     $installPrefix/share/creatools_base_library_config.sh
-
 
+  #create creatools_base_library_config.sh  at the very begining, so we can write "export xxx_BIN=..." inside installmod.sh. JPRx 3 mars 2011
 
-  # Install creatools as user (no longer as root) // JPR 2/5/2011
+  export baseLibraryCreatoolsDir=$installPrefix/share/creatools
+  mkdir -p $baseLibraryCreatoolsDir
 
-  # - 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
+  cp CreaTools-bashrc.sh $baseLibraryCreatoolsDir/.
 
-  mkdir -p $installPrefix
-  mkdir -p $installPrefix/share
-  echo '## This file is call from .bashrc' > $installPrefix/share/creatools_base_library_config.sh
+  echo '## This file is call from .bashrc' > $baseLibraryCreatoolsDir/creatools_base_library_config.sh
   bash installmodBash.sh $installPrefix
 
   # JPR 2/5/2011
@@ -107,14 +97,9 @@
   bash installmodNomake.sh $buildType wx                 $generationdir  $installPrefix
   bash installmodNomake.sh $buildType wxvtk              $generationdir  $installPrefix
 
-#EED  I don't know why this works here and not after the chmod 755
-#EED  bash installmodBash.sh $installPrefix
-
-echo "===================================================in CreaTools-install.sh ETC_BASHRC : "  $ETC_BASHRC 
-echo installPrefixtmp=$installPrefix >> $ETC_BASHRC
-echo '[ -f "$installPrefixtmp/share/creatools_base_library_config.sh" ] &&  source $installPrefixtmp/share/creatools_base_library_config.sh $installPrefixtmp' >> $ETC_BASHRC 
 
-source $installPrefix/share/creatools_base_library_config.sh $installPrefix
+source CreaTools-bashrc.sh
+source $ETC_BASHRC 
 
 ##EED 21/12/2014
 ##EED echo "==================================================="

diff --git a/Linux/scripts/Install-Creatools-Bin.sh b/Linux/scripts/Install-Creatools-Bin.sh
new file mode 100755 (executable)
index 0000000..f44dce7
--- /dev/null
+++ b/Linux/scripts/Install-Creatools-Bin.sh
@@ -0,0 +1,36 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+
+
+#!/bin/bash
+
+rm -rf Creatools
+mkdir Creatools
+cd Creatools
+wget http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/creatools-DownloadLastVersion.sh
+source creatools-DownloadLastVersion.sh
+ETC_BASHRC=~/.bashrc
+installPrefix=$(pwd)/creatools_install/
+source creatools_install/share/creatools/CreaTools-bashrc.sh
+cd ..
+

diff --git a/Linux/scripts/installmod.sh b/Linux/scripts/installmod.sh
index 48f9870fcb20bb0449e1b5f430e4ea9301d0e7c0..c3d4b2283d2306f8beee5fbcde13f830bb404a87 100644 (file)
--- a/Linux/scripts/installmod.sh
+++ b/Linux/scripts/installmod.sh
@@ -48,10 +48,10 @@ then
    # grouik style patch JPR
    if [ $2 = "bbtk" ]
    then
-      echo export BBTK_DIR='$'installPrefix/lib64/creatools/$2   >> $installPrefix/share/creatools_base_library_config.sh
+      echo export BBTK_DIR='$'installPrefix/lib64/creatools/$2   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
    else
-      echo export $2_DIR='$'installPrefix/lib64/creatools/$2     >> $installPrefix/share/creatools_base_library_config.sh
-      echo export bb$2_DIR='$'installPrefix/lib64/creatools/bb$2 >> $installPrefix/share/creatools_base_library_config.sh      
+      echo export $2_DIR='$'installPrefix/lib64/creatools/$2     >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
+      echo export bb$2_DIR='$'installPrefix/lib64/creatools/bb$2 >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh      
    fi
 
 else
@@ -60,10 +60,10 @@ else
       # grouik style patch JPR
       if [ $2 = "bbtk" ]
       then
-         echo "export BBTK_DIR='$'installPrefix/lib/creatools/$2"   >> $installPrefix/share/creatools_base_library_config.sh
+         echo "export BBTK_DIR='$'installPrefix/lib/creatools/$2"   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
       else
-         echo "export $2_DIR='$'installPrefix/lib/creatools/$2"     >> $installPrefix/share/creatools_base_library_config.sh
-         echo "export bb$2_DIR='$'installPrefix/lib/creatools/bb$2" >> $installPrefix/share/creatools_base_library_config.sh    
+         echo "export $2_DIR='$'installPrefix/lib/creatools/$2"     >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
+         echo "export bb$2_DIR='$'installPrefix/lib/creatools/bb$2" >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh    
       fi
    else
       echo "============================= NEITHER $installPrefix/lib64 NOR $installPrefix/lib EXIST ?!?"

diff --git a/Linux/scripts/installmodBash.sh b/Linux/scripts/installmodBash.sh
index 428195deb6bdd41c0bab61cd68281be120102e91..5cfef5c0ba86b6b823ffab57464c2707eed57bb8 100644 (file)
--- a/Linux/scripts/installmodBash.sh
+++ b/Linux/scripts/installmodBash.sh
@@ -32,14 +32,14 @@ echo "------------------------------------------in installmodBash-------------"
 source CreaTools-configure.sh
 source CreaTools-names.sh
 
-echo installPrefix='$1'   >> $installPrefix/share/creatools_base_library_config.sh
-echo export PATH='$'PATH:'$'installPrefix/bin                                   >> $installPrefix/share/creatools_base_library_config.sh
+echo installPrefix='$1'   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
+echo export PATH='$'PATH:'$'installPrefix/bin >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
 if [ $OperatingSystem = "MacOS" ]
 then
-  echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'installPrefix/lib/creatools   >> $installPrefix/share/creatools_base_library_config.sh
+  echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'installPrefix/lib/creatools   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
 else
-  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
+  echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'installPrefix/lib/creatools   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
+  echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'installPrefix/lib64/creatools >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
 fi
 
 

diff --git a/Linux/scripts/installmodNomake.sh b/Linux/scripts/installmodNomake.sh
index 7910d159f27085fa67f6c2a885a5328e9c8777b1..6c7209c86b04371c91b4e6cbb9eb3e819ed4215b 100644 (file)
--- a/Linux/scripts/installmodNomake.sh
+++ b/Linux/scripts/installmodNomake.sh
@@ -53,10 +53,10 @@ then
    # grouik style patch JPR
    #if [ $2 = "bbtk" ]
    #then
-   #   echo export BBTK_DIR=$installPrefix/lib64/creatools/$2   >> $installPrefix/share/creatools_base_library_config.sh
+   #   echo export BBTK_DIR=$installPrefix/lib64/creatools/$2   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
    #else
-      echo export $2_DIR='$'installPrefix/lib64/creatools/$2     >> $installPrefix/share/creatools_base_library_config.sh
-      echo export bb$2_DIR='$'installPrefix/lib64/creatools/bb$2 >> $installPrefix/share/creatools_base_library_config.sh      
+      echo export $2_DIR='$'installPrefix/lib64/creatools/$2     >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
+      echo export bb$2_DIR='$'installPrefix/lib64/creatools/bb$2 >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh      
    #fi
 fi
 
@@ -65,10 +65,10 @@ then
    # grouik style patch JPR
 #   if [ $2 = "bbtk" ]
 #   then
-#      echo "export BBTK_DIR=$installPrefix/lib/creatools/$2"   >> $installPrefix/share/creatools_base_library_config.sh
+#      echo "export BBTK_DIR=$installPrefix/lib/creatools/$2"   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
 #   else
-      echo "export $2_DIR='$'installPrefix/lib/creatools/$2"     >> $installPrefix/share/creatools_base_library_config.sh
-      echo "export bb$2_DIR='$'installPrefix/lib/creatools/bb$2" >> $installPrefix/share/creatools_base_library_config.sh    
+      echo "export $2_DIR='$'installPrefix/lib/creatools/$2"     >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
+      echo "export bb$2_DIR='$'installPrefix/lib/creatools/bb$2" >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh    
 #   fi
    
 else