Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/creaToolsTools

[creaToolsTools.git] / Linux / installscript

diff --git a/Linux/installscript b/Linux/installscript
index 09dbd74192b1a61dda716853c2f89952d85fcfdb..c8112ea419f088a586410ff75110cdebe057230c 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -159,9 +159,6 @@ ITKVersion=ITK3
 export ETC_BASHRC=~/.bashrc
 
 
-
-
-
 function usage {
     echo "installscript [options] command" 
     echo "creatools configure/compile/install script" 
@@ -173,29 +170,31 @@ function usage {
     echo "    command:" 
     echo "" 
     echo "    as a normal user:" 
-    echo "         config            : set the configuration parameters only" 
+    echo "         config                    : set the configuration parameters only" 
     echo "         "                 
     echo "    need root password:" 
-    echo "         3rd               : Get, Compile, Install all 3rd party library "
-    echo "         3rd-base          : Install basic tools (cmake, doxygen...)"
-    echo "         3rd-vtk           : Get, Compile, Install vtk"
-    echo "         3rd-itk           : Get, Compile, Install itk"
-    echo "         3rd-gdcm          : Get, Compile, Install gdcm"
-    echo "         3rd-wx            : Get, Compile, Install wx widget (for Mac Users)"
+    echo "         3rd                       : Get, Compile, Install all 3rd party library "
+    echo "         3rd-base                  : Install basic tools (cmake, doxygen...)"
+    echo "         3rd-vtk                   : Get, Compile, Install vtk"
+    echo "         3rd-itk                   : Get, Compile, Install itk"
+    echo "         3rd-gdcm                  : Get, Compile, Install gdcm"
+    echo "         3rd-wx                    : Get, Compile, Install wx widget (for Mac Users)"
     echo "   "
     echo "    as a normal user:" 
-    echo "         creatools         : Get Compile and Install the CreaTools"
-    echo "         creatools-get     : Get the CreaTools"
-    echo "         creatools-cmp     : Compile the CreaTools"
-    echo "         creatools-install : Install the CreaTools"
+    echo "         creatools                 : Get Compile and Install the CreaTools"
+    echo "         creatools-get             : Get the CreaTools"
+    echo "         creatools-cmp             : Compile the CreaTools"
+    echo "         creatools-install         : Install the CreaTools"
     echo "   "
-    echo "         uninstall         : uninstall the creatools"
+    echo "         creatools-generateBinTGZ  : generation of CreaTools.tgz (binary version)" 
     echo "   "
-    echo "         printconfig       : print the configuration" 
-    echo "         help              : print help"
-    echo "         env               : print some environnement variables"
+    echo "         uninstall                 : uninstall the creatools"
+    echo "   "
+    echo "         printconfig               : print the configuration" 
+    echo "         help                      : print help"
+    echo "         env                       : print some environnement variables"
     echo "" 
-    echo "         all               : configure / compile / install" 
+    echo "         all                       : configure / compile / install" 
     echo "         "                 
     echo "   "
     echo "   "
@@ -246,7 +245,7 @@ if [ $# -le 0 ] ; then usage; fi
 command=$1
 
 # check that command is valid
-if [ `checkVal $command all config 3rd 3rd-base 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx creatools creatools-get creatools-cmp creatools-install uninstall printconfig help env` == "false" ] ; then
+if [ `checkVal $command all config 3rd 3rd-base 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx creatools creatools-get creatools-cmp creatools-install creatools-generateBinTGZ uninstall printconfig help env` == "false" ] ; then
     echo "Unrecognized command: $command"
     echo ""
     usage
@@ -346,19 +345,13 @@ fi
 # install packaged dependencies as root
 if [ `checkVal $command all 3rd 3rd-base` == true ] ; then
     bigDisplay "INSTALL PACKAGES DEPENDENCIES"
-    if [ "`whoami`" == root ] ; then
-       echo ThirdParty-install-Base-Stuff
-       bash scripts/ThirdParty-install-Base-Stuff.sh
-    else 
-        # must log as root
-        echo "Please enter the root passwd to add necessary packages:"; 
-        su -c "bash scripts/ThirdParty-install-Base-Stuff.sh"   
-    fi
+    source scripts/CreaTools-configure.sh
+    cd scripts
+    source ThirdParty-install-Base-Stuff.sh $OperatingSystem
+    cd ..
     bash scripts/ThirdParty-install.sh
 fi
 
-
-
 # vtk
 if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
     bigDisplay "INSTALL VTK"
@@ -377,12 +370,9 @@ fi
 if [ `checkVal $command all 3rd 3rd-itk` == true ] ; then
     bigDisplay "INSTALL $ITKVersion"
     bash scripts/ThirdParty-install-ITK.sh
+    cd $scriptDirName
 fi
 
-## ??
-#if [ `checkVal $command all 3rd` == true ] ; then
-#    bash scripts/ThirdParty-install.sh
-#fi
 
 # Setup the user .bashrc correctly
 if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; then
@@ -398,6 +388,8 @@ fi
 # compile creatools
 if [ `checkVal $command all creatools creatools-cmp` == true ] ; then
     bigDisplay "COMPILE CREATOOLS"
+echo "EED installscript compile creatools"
+echo $ETC_BASHRC
     source $ETC_BASHRC
     bash -x scripts/CreaTools-compile.sh
 
@@ -425,13 +417,18 @@ 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..."
 fi
 
+#generate TGZ version of the bin (Creatools and ThirdParty)
+if [ `checkVal $command creatools-generateBinTGZ` == true ] ; then
+    bash scripts/CreaTools-GenerateBinTGZ.sh
+fi
+
 ################################################################################## uninstall
 if [ `checkVal $command uninstall` == true ] ; then
     bigDisplay "UNINSTALL CREATOOLS"