X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Finstallscript;h=9c2ef2b2570bb93d6a159b9048ea09e95964fca9;hb=96ba0c7c5b92d1d728f1f786282a198c0d7f001e;hp=7c6530ac670b8aad07a93f5901c578255c4f4bfd;hpb=fd2aac7e56a2ae4ecd5ed98deec488f6dbbedc1b;p=creaToolsTools.git

diff --git a/Linux/installscript b/Linux/installscript
index 7c6530a..9c2ef2b 100755
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -173,29 +173,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 +248,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
@@ -335,6 +337,12 @@ if [ `checkVal $command config printconfig` == true ] ; then
     exit
 fi
 
+################################################################################## creatools
+# download creatools
+if [ `checkVal $command all creatools creatools-get` == true ] ; then
+    bigDisplay "DOWNLOAD CREATOOLS"
+    bash scripts/CreaTools-load.sh
+fi
 
 ################################################################################## 3rd library
 # install packaged dependencies as root
@@ -389,13 +397,6 @@ if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; th
 fi
 
 ################################################################################## creatools
-
-# download creatools
-if [ `checkVal $command all creatools creatools-get` == true ] ; then
-    bigDisplay "DOWNLOAD CREATOOLS"
-    bash scripts/CreaTools-load.sh
-fi
-
 # compile creatools
 if [ `checkVal $command all creatools creatools-cmp` == true ] ; then
     bigDisplay "COMPILE CREATOOLS"
@@ -422,10 +423,23 @@ if [ `checkVal $command all creatools creatools-install` == true ] ; then
     source $ETC_BASHRC
     bash scripts/CreaTools-install.sh
     source $ETC_BASHRC
+    echo " "
+    echo " "
+    echo " "
+    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
 
-################################################################################## uninstall
+#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"
     bash scripts/CreaTools-uninstall.sh