X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Finstallscript;h=70fb2846b2fff369df4bc54e9d45b91e0d15c5bb;hb=f513924db3c927ac3c0e765731487572f25fcf1c;hp=b27809994b5099722dd574817f9e705fdad50d07;hpb=087d38e987bc323ac2738863f5ce0cfd5ca30368;p=creaToolsTools.git

diff --git a/Linux/installscript b/Linux/installscript
index b278099..70fb284 100755
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -23,6 +23,8 @@
 
 #!/bin/bash -e
 
+scriptDirName=$(dirname $(readlink -f $0) )
+
 #########################################################################
 ############     Local Functions  #######################################
 #########################################################################
@@ -119,9 +121,6 @@ function printconfig {
     echo "  Install Prefix for CreaTools               : $installPrefix"
     echo "  Boolean for Doc Generation                 : $docgeneration"
     echo "  Where do you want to get source files from : $sourcesFrom"
-    if [ $sourcesFrom = GIT ] ; then
-    echo "  GIT User Name                              : $gitUserName"
-    fi
     echo "  Login User Name                            : $loginUserName"
     echo "  Login Group Name                           : $loginGroupName"
     echo "  Build type                                 : $buildType"          
@@ -152,7 +151,6 @@ installPrefix=
 docgeneration=OFF
 sourcesFrom=HTML
 
-gitUserName=
 loginUserName=$USER
 loginGroupName=`groups | awk '{print $1}'`
 buildType=RelWithDebug
@@ -173,10 +171,11 @@ function usage {
     echo "" 
     echo "" 
     echo "    command:" 
-    echo "         all               : configure / compile / install" 
-    echo "         "                 
+    echo "" 
+    echo "    as a normal user:" 
     echo "         config            : set the configuration parameters only" 
     echo "         "                 
+    echo "    as root:" 
     echo "         3rd               : Get, Compile, Install all 3rd party library "
     echo "         3rd-base          : Install basic tools (cmake, doxygen...)"
     echo "         3rd-vtk           : Get, Compile, Install vtk"
@@ -184,6 +183,7 @@ function usage {
     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"
@@ -194,6 +194,9 @@ function usage {
     echo "         printconfig       : print the configuration" 
     echo "         help              : print help"
     echo "         env               : print some environnement variables"
+    echo "" 
+    echo "         all               : configure / compile / install" 
+    echo "         "                 
     echo "   "
     echo "   "
     echo "   "
@@ -204,7 +207,8 @@ function usage {
     echo "        -gdir <dir>           : generation directory (default $generationdir)"
     echo "        -instprefix <dir>     : creatools install prefix" 
     echo "        -instprefix3 <dir>    : 3rd party library install prefix" 
-    echo "        -git <gitusername>    : get creatools from git (CREATIS user only)"
+    echo "        -git                  : get creatools from git (CREATIS user only)"
+    echo "        -git-read-only        : get creatools from git (anonymously, no write access)"
     echo "        -build                : build type Release, RelWithDebug or Debug (default RelWithDebug)"
     echo ""
     echo "     experimental configure options (use at your own risk!!):"
@@ -225,7 +229,9 @@ while [ $# -ge 1 ] ; do
         -instprefix)        installPrefix=$2;                          shift 2;;
         -instprefix3)       installPrefixThird=$2;                     shift 2;;
         -doc)               docgeneration=ON;                          shift 1;;
-        -git)               sourcesFrom=GIT; gitUserName=$2;           shift 2;;
+        -git)               sourcesFrom=GIT;                           shift 1;;
+        -git-read-only)     sourcesFrom=GIT-READ-ONLY;
+shift 1;;
         -gdcm2)             gdcmVersion=GDCM2;                         shift 1;;
         -itk4)              ITKVersion=ITK4;                           shift 1;;
         -build)             buildType=$2;                              shift 2;;
@@ -300,7 +306,6 @@ if [ `checkVal $command config all` == true ] ; then
     echo "installPrefixThird=$installPrefixThird" >> $configureFile
     echo "docgeneration=$docgeneration"           >> $configureFile
     echo "sourcesFrom=$sourcesFrom"               >> $configureFile
-    echo "gitUserName=$gitUserName"               >> $configureFile 
     echo "loginUserName=$loginUserName"           >> $configureFile
     echo "loginGroupName=$loginGroupName"         >> $configureFile
     echo "buildType=$buildType"                   >> $configureFile
@@ -334,7 +339,8 @@ fi
 if [ `checkVal $command all 3rd 3rd-base` == true ] ; then
     bigDisplay "INSTALL PACKAGES DEPENDENCIES"
     if [ "`whoami`" == root ] ; then
-        bash scripts/ThirdParty-install-Base-Stuff.sh
+       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:"; 
@@ -343,16 +349,20 @@ if [ `checkVal $command all 3rd 3rd-base` == true ] ; then
     bash scripts/ThirdParty-install.sh
 fi
 
+
+
 # vtk
 if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
     bigDisplay "INSTALL VTK"
-    bash scripts/ThirdParty-install-VTK.sh
+    source scripts/ThirdParty-install-VTK.sh
+    cd $scriptDirName
 fi
 
 # gdcm
 if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then
     bigDisplay "INSTALL $gdcmVersion"
-    bash scripts/ThirdParty-install-gdcm.sh
+    source scripts/ThirdParty-install-gdcm.sh
+    cd $scriptDirName
 fi
 
 # itk
@@ -389,7 +399,7 @@ fi
 if [ `checkVal $command all creatools creatools-cmp` == true ] ; then
     bigDisplay "COMPILE CREATOOLS"
     source $ETC_BASHRC
-    bash -x scripts/CreaTools-compile.sh
+   bash -x scripts/CreaTools-compile.sh
 
     # To allow (*very* aware) user to patch code, later
     if [ ! -e $generationdir/creatools_source ] ; then